# Translations
+# Translations
+
+
# Translations
Comment[oc]=@APPLICATION_NAME@ sincronizacion del client
GenericName[oc]=Dorsièr de Sincronizacion
GenericName[th_TH]=ประสานข้อมูลโฟลเดอร์
Name[th_TH]= @APPLICATION_NAME@ ไคลเอนต์ประสานข้อมูลเดสก์ท็อป
Icon[th_TH]=@APPLICATION_EXECUTABLE@
+GenericName[es_MX]=Sincronización de Carpetas
Comment[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient
GenericName[nb_NO]=Mappesynkronisering
Name[nb_NO]=@APPLICATION_NAME@ skrivebordssynkroniseringsklient
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>El fitxer de destinació té una mida o data de modificació inesperada</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Aplica</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<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="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>No hi ha cap compte configurat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Afegeix-ne un de nou</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Elimina</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Trieu què sincronitzar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Elimina la connexió de la carpeta sincronitzada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Ha fallat la creació de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirma l'eliminació de la connexió de la carpeta sincronitzada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Elimina la connexió de la carpeta sincronitzada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>S'està sincronitzant</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 en ús</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 com a <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>La versió del servidor %1 és antiga i fora de suport! Continua sota la teva responsabilitat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Connectat a %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<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="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>S'ha desconnectat de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Inici de sessió</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Hi ha carpetes noves que no s'han sincronitzat perquè són massa grans:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Confirmeu l'eliminació del compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Elimina la connexió</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Obre la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Surt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Continua la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Pausa la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en ús</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Activitat del servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protocol de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Llista de fitxers ignorats o erronis</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Còpia</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia la llista d'activitats al porta-retalls.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>No sincronitzat</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>No sincronitzat (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>La llista de l'activitat del servidor s'ha copiat al porta-retalls.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>La llista d'activitat de sincronització s'ha copiat al porta-retalls</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>La llista d'elements no sincronitzats s'ha copiat al porta-retalls</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>S'ha copiat al porta-retalls</translation>
</message>
<translation><br/>El compte %1 no té les activitats habilitades.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Heu rebut %n nova notificació de %2.</numerusform><numerusform>Heu rebut %n noves notificacions de %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Heu rebut %n nova notificació de %1 i %2.</numerusform><numerusform>Heu rebut %n noves notificacions de %1 i %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Heu rebut noves notificacions de %1, %2 i altres comptes.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 notificacions - Es requereix una acció</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Error en escriure les metadades a la base de dades</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>El fitxer local %1 no existeix.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 hauria de ser una carpeta, però no ho és.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>S'ha esborrat '%1'</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>S'ha descarregat %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>S'ha actualitzat %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 s'ha reanomenat a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 s'ha mogut a %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 i %n altre fitxer s'ha esborrat.</numerusform><numerusform>%1 i %n altres fitxers s'han esborrat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 i %n altre fitxer s'han descarregat.</numerusform><numerusform>%1 i %n altres fitxers s'han descarregat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 i %n altre fitxer s'han actualitzat.</numerusform><numerusform>%1 i %n altres fitxers s'han actualitzat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 s'ha reanomenat a %2 i %n altre fitxer s'ha reanomenat.</numerusform><numerusform>%1 s'ha reanomenat a %2 i %n altres fitxers s'han reanomenat.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 s'ha mogut a %2 i %n altre fitxer s'ha mogut.</numerusform><numerusform>%1 s'ha mogut a %2 i %n altres fitxers s'han mogut.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 i %n altre fitxer tenen conflictes de sincronització</numerusform><numerusform>%1 i %n altres fitxers tenen conflictes de sincronització</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 té conflictes de sincronització. Comproveu el fitxer conflictiu!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 i %n altre fitxer no s'han sincronitzat per errors.
Consulteu el registre per obtenir més informació.</numerusform><numerusform>%1 i %n altres fitxers no s'han sincronitzat per errors.
Consulteu el registre per obtenir més informació.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no s'ha pogut sincronitzar degut a un error. Mireu el registre per més detalls.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Copia de seguretat detectada</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Sincronització normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Manté els fitxers locals com a conflicte</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<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="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(copia de seguretat)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(copia de seguretat %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>S'està esperant per començar a sincronitzar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>S'està preparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>S'està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<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="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>La ruta seleccionada no és un directori!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 pendent, %1 de %2, fitxer %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>fitxer %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>S'està esperant...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>S'està preparant per sincronitzar...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>El servidor retorna un error de contingut o rang</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Temps de connexió excedit</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Introduïu la contrasenya de %1:
-
-Usuari: %2
-Compte: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<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>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Escriviu contrasenya</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Temps d'espera de la connexió esgotat.</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>Correu &electrònic</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Connecta a %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Escriviu les credencials d'usuari</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">S'ha connectat correctament amb %1: %2 versió %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Ha fallat la connexió amb %1 a %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>S'ha esgotat el temps d'espera mentres es conectava a %1 a les %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Intentant connectar amb %1 a %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>El servidor ha prohibit l'accés. Per verificar que teniu permisos, <a href="%1">cliqueu aquí</a> per accedir al servei amb el vostre navegador.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>La carpeta local %1 ja existeix, s'està configurant per sincronitzar.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>S'està creant la carpeta de sincronització local %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>correcte</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>ha fallat.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>No s'ha pogut crear la carpeta local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>No heu especificat cap carpeta remota!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>creant la carpeta a ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>La carpeta remota %1 s'ha creat correctament.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>La carpeta remota %1 ja existeix. S'hi està connectant per sincronitzar-les.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La creació de la carpeta ha resultat en el codi d'error HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Ha fallat la creació de la carpeta perquè les credencials proporcionades són incorrectes!<br/>Aneu enrera i comproveu les credencials.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">La creació de la carpeta remota ha fallat, probablement perquè les credencials facilitades són incorrectes.</font><br/>Comproveu les vostres credencials.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>La creació de la carpeta remota %1 ha fallat amb l'error <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>S'ha establert una connexió de sincronització des de %1 a la carpeta remota %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Connectat amb èxit a %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>No s'ha pogut establir la connexió amb %1. Comproveu-ho de nou.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Ha fallat en canviar el nom de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>No es pot esborrar i restaurar la carpeta perquè una carpeta o un fitxer de dins està obert en un altre programa. Tanqueu la carpeta o el fitxer i intenteu-ho de nou o cancel·leu la configuració.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>la carpeta de sincronització %1 s'ha creat correctament!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>Assistent de connexió %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Salta la configuració de carpetes</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Error en escriure les metadades a la base de dades</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>La descàrrega reduïrà l'espai lliure al disc per sota de %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>L'espai lliure del disc dur es inferior a %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>El fitxer s'ha esborrat del servidor</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>No es pot descarregar el fitxer completament.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>El fitxer ha canviat des de que es va descobrir</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Error en escriure les metadades a la base de dades</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>El fitxer %1 no es pot reanomenar a %2 perquè hi ha un xoc amb el nom d'un fitxer local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Error en escriure les metadades a la base de dades</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>No s'ha de canviar el nom d'aquesta carpeta. Es reanomena de nou amb el seu nom original.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Aquesta carpeta no es pot reanomenar. Reanomeneu-la de nou Shared.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>El fitxer s'ha reanomenat però és part d'una compartició només de lectura. El fixter original s'ha restaurat.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Error en escriure les metadades a la base de dades</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Fitxer eliminat</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>El fitxer local ha canviat durant la sincronització.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>El fitxer local s'ha eliminat durant la sincronització.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Error en escriure les metadades a la base de dades</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>camí de l'OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>Compartint amb %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>El servidor no permet la compartició de fitxers</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Copia l'en&llaç</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Permetre edició</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Protegit amb contr&asenya</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Protegit amb contrasenya</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>La comp&artició pública requereix una contrasenya</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Establiu la contrasenya</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>Com&parteix l'enllaç</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Error d'accés</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Èxit.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de paràmetre en CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>Temps excedit en la connexió.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>S'ha produït un error en obrir una carpeta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Error en llegir la carpeta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>El fitxer/carpeta s'ha ignorat perquè és ocult.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Error inespecífic de CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Aturat per l'usuari</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>El servei no està disponible temporalment</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Accés prohibit</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>El nom de fitxer és massa llarg.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<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="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<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="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>El nom del fitxer conté al menys un caràcter invàlid</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<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="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<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="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>el destí</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>l'origen</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versió %1. Per més informació visiteu <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuït per %1 i amb llicència GNU General Public License (GPL) Versió 2.0.<br/>%2 i el %2 logo són marques registrades de %1 als Estats Units, altres països, o ambdós.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Acrediteu-vos</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Carpeta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>No hi ha fitxers de sincronització configurats</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>No hi han carpetes sincronitzades configurades.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Obre al navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Inicia la sessió</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Surt</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Canvis recents</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>S'està comprovant els canvis a '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Fitxers gestionats:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Obre carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Obre %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Estat desconegut</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Arranjament...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Detalls...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Surt %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>S'ha desconnectat de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>La versió del servidor no és compatible</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor del compte %1 utilitza la versió antiga %2 antiga i no és compatible. Usar aquest client amb versions no compatibles del servidor no s'ha provat i pot ser potencialment perillós. Procediu sota la vostra responsabilitat.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Desconnectat dels comptes:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Compte %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>La sincronització del compte està deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Reprén totes les carpetes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Pausa totes les carpetes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Reprèn totes les sincronitzacions</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Reprèn la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Pausa totes les sincronitzacions</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Pausa la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Surt de tots els comptes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Connecta a tots els comptes...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>No hi ha elements sincronitzats recentment</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronitzant %1 de %2 (%3 pendents)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronitzant %1 (%2 pendents)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Actualitzat</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Comença una sin&cronització des de zero (esborra la carpeta local!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Trieu què sincronitzar</translation>
</message>
<translation>Sincronitza-ho tot des del servidor</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Missatge d'estat</translation>
</message>
<translation>Formulari</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>Nom d'&usuari</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Contrasenya</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Etiqueta d'error</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>TextLabel</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>al futur</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>fa %n dia</numerusform><numerusform>fa %n dies</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>fa %n hora</numerusform><numerusform>fa %n hores</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>ara</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Fa menys d'un minut</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>fa %n minut</numerusform><numerusform>fa %n minuts</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Fa una estona</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n any</numerusform><numerusform>%n anys</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n mes</numerusform><numerusform>%n mesos</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n dia</numerusform><numerusform>%n dies</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n hores</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minut</numerusform><numerusform>%n minuts</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n segon</numerusform><numerusform>%n segons</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construït de la revisió de Git <a href="%1">%2</a> el %4 de %3 usant Qt %5, %6</small></p></translation>
</message>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Desconegut</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>baixant</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>pujant</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>esborrant</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>movent</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorant</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>error</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Cílový soubor má neočekávanou velikost nebo čas změny</translation>
</message>
<translation>Neoznačené adresáře 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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Použít</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<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="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Žádný účet nenastaven.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Přidat nový</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Odebrat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Účet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Vybrat co sesynchronizovat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Odstranit připojení synchronizace adresáře</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Vytvoření adresáře selhalo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potvrdit odstranění připojení synchronizace adresáře</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstranit připojení synchronizace adresáře</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Synchronizace probíhá</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 používaný</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 jako <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Server verze %1 je zastaralý a nepodporovaný! Pokračujte na vlastní riziko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Připojeno k %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 je dočasně nedostupný.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Odhlášeno z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Přihlásit</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Jsou dostupné nové adresáře, které nebyly synchronizovány z důvodu jejich nadměrné velikosti:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Potvrdit odstranění účtu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Odstranit připojení</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Otevřít adresář</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Odhlásit se</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Pokračovat v synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Pozastavit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>Používaných %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Aktivita serveru</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protokol synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Seznam ignorovaných nebo poškozených souborů</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopie</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopírovat záznam aktivity do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Nesesynchronizováno</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Nesesynchronizováno (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Výpis aktivity serveru byl zkopírován do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Výpis aktivity synchronizace byl zkopírován do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Seznam nesynchronizovaných položek byl zkopírován do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Zkopírováno do schránky</translation>
</message>
<translation><br/>Účet %1 nemá zapnuté aktivity.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Dostali jste %n nové upozornění od %2.</numerusform><numerusform>Dostali jste %n nové upozornění od %2.</numerusform><numerusform>Dostali jste %n nových upozornění od %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Dostali jste %n nové upozornění od %1 a %2.</numerusform><numerusform>Dostali jste %n nové upozornění od %1 a %2.</numerusform><numerusform>Dostali jste %n nových upozornění od %1 a %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Dostali jste nové upozornění od %1, %2 a dalších uživatelů.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Upozornění - Vyžadována akce</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Chyba zápisu metadat do databáze</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Místní adresář %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 by měl být adresář, ale není.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl odebrán.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl stažen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl aktualizován.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 byl přejmenován na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 byl přemístěn do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 soubor bude smazán.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 soubor byl stažen.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 soubor byl aktualizován.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 byl přejmenován na %2.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 byl přesunut do %2.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 má problém se synchronizací. Prosím zkontrolujte chybový soubor.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 soubor nemůže být synchronizován kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nebyl kvůli chybě synchronizován. Detaily jsou k nalezení v logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Tato synchronizace resetuje soubory na dřívější čas v synchronizovaném adresáři '%1'.
-Toto může být způsobeno obnovením zálohy na straně serveru.
-Pokračováním v synchronizaci způsobí přepsání všech vašich souborů staršími soubory z dřívějšího stavu. Přejete si ponechat své místní nejaktuálnější soubory jako konfliktní soubory?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Záloha nalezena</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Normální synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Ponechat místní soubory jako konflikt</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Nelze obnovit stav adresáře</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation> (záloha)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation> (záloha %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Čeká na spuštění synchronizace.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Nebyl vybrán platný adresář!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nemáte oprávnění pro zápis do zvoleného adresáře!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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 adresáři použitém pro synchronizaci. Vyberte prosím jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 zbývá, %1 ze %2, soubor %3 z %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>soubor %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Chvíli strpení...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Synchronizace se připravuje...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Server odpověděl chybným rozsahem obsahu</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Čas spojení vypršel</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Vložte prosím %1 heslo:
-
-Uživatel: %2
-Účet: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<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"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Zadejte heslo</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Připojení vypršelo</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&Email</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Připojit k %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Zadejte přihlašovací údaje</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Úspěšně připojeno k %1: %2 verze %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Selhalo spojení s %1 v %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Vypršení časového limitu při pokusu o připojení k %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Pokouším se připojit k %1 na %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Ověřený požadavek na server byl přesměrován na '%1'. URL je špatně, server není správně nakonfigurován.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Byla obdržena nesprávná odpověď na ověřený webdav požadavek</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Přístup zamítnut serverem. Pro ověření správných přístupových práv <a href="%1">klikněte sem</a> a otevřete službu ve svém prohlížeči.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Místní synchronizovaný adresář %1 již existuje, nastavuji jej pro synchronizaci.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Vytvářím místní adresář pro synchronizaci %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>selhalo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Nelze vytvořit místní adresář %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Není nastaven žádný vzdálený adresář!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Chyba: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>vytvářím adresář na ownCloudu: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Vzdálený adresář %1 byl úspěšně vytvořen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Vzdálený adresář %1 již existuje. Spojuji jej pro synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Vytvoření adresáře selhalo s HTTP chybou %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.<br/>Vraťte se prosím zpět a zkontrolujte je.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.</font><br/>Vraťte se prosím zpět a zkontrolujte je.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Vytváření vzdáleného adresáře %1 selhalo s chybou <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Bylo nastaveno synchronizované spojení z %1 do vzdáleného adresáře %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Úspěšně spojeno s %1.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Spojení s %1 nelze navázat. Prosím zkuste to znovu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Přejmenování adresáře selhalo</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Nelze odstranit a zazálohovat adresář, protože adresář nebo soubor v něm je otevřen v jiném programu. Prosím zavřete adresář nebo soubor a zkuste znovu nebo zrušte akci.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Místní synchronizovaný adresář %1 byl úspěšně vytvořen!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Průvodce spojením</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Přeskočit konfiguraci adresářů</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Chyba zápisu metadat do databáze</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Stažení by snížilo velikost volného místa na disku pod %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Volné místo na disku je méně než %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Soubor byl smazán ze serveru</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Soubor nemohl být kompletně stažen.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>Stažený soubor je prázdný, přestože server oznámil, že měl být %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Soubor se mezitím změnil</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Chyba zápisu metadat do databáze</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Soubor %1 nemohl být přejmenován na %2 z důvodu kolize názvu se souborem v místním systému</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Chyba zápisu metadat do databáze</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tento adresář nemůže být přejmenován. Byl mu vrácen původní název.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tento adresář nemůže být přejmenován. Přejmenujte jej prosím zpět na Shared.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Soubor byl přejmenován, ale je součástí sdílení pouze pro čtení. Původní soubor byl obnoven.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Server vrátil neplatný HTTP kód. Očekáván 201, ale obdržen "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Chyba zápisu metadat do databáze</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Soubor odebrán</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Místní soubor se během synchronizace změnil. </translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Místní soubor byl změněn během synchronizace.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Chybí adresa URL</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Místní soubor byl odstraněn během synchronizace.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Server nepotvrdil poslední část dat. (Nebyl nalezen e-tag)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Chyba zápisu metadat do databáze</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>ownCloud cesta:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 sdílení</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Adresář: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Sdílení je na serveru zakázáno</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Přijímání nejvyšších možných oprávnění pro sdílení ze serveru...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Zkopírovat &odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Povolit úpravy</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Ch&ránit heslem</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Chráněno heslem</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Veřejné s&dílení vyžaduje heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Nastavte prosím heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Sdílet odkaz</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Chyba přihlášení</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Úspěch.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync se nezdařilo rezervovat paměť.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync: kritická chyba parametrů.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>Nastala chyba HTTP přenosu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<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="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Chyba při čtení adresáře.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Soubor/adresář je ignorován, protože je skrytý.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Je dostupných pouze %1, pro spuštění je potřeba alespoň %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Nespecifikovaná chyba CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Zrušeno uživatelem</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>Selhal přístup pro CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync selhalo z důvodu nezpracovaného zamítnutí oprávnění.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<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="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Služba je dočasně nedostupná</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Přístup je zakázán</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Jméno souboru je moc dlouhé.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Stat selhal.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<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="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Nelze načíst blacklist z místní databáze</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Nelze číst ze žurnálu synchronizace.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<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="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Jméno souboru obsahuje aelspoň jeden neplatný znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranění není povoleno, obnovuji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>Místní soubory a sdílený adresář byly odstraněny.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<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="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>cílové umístění</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Verze %1. Více informací na <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Šíří %1 pod licencí GNU General Public License (GPL) Verze 2.0.<br/>%2 a %2 logo jsou registrované známky %1 ve Spojených Státech, ostatních zemích, nebo obojí.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Přihlašte se prosím</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Adresář %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Nejsou nastaveny žádné synchronizované adresáře.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Nejsou nastaveny žádné adresáře pro synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Otevřít v prohlížeči</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Přihlásit...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Odhlásit se</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Poslední změny</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Kontrola změn v '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Spravované adresáře:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Otevřít adresář '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Otevřít %1 v prohlížeči</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Neznámý stav</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Nastavení...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Podrobnosti...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Ukončit %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Odpojeno od %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Nepodporovaná verze serveru</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Server na účtu %1 používá starou a nepodporovanou verzi %2. Používání tohoto klienta s nepodporovanými verzemi serveru není testováno a může být potencionálně nebezpečné. Pokračujte na vlastní riziko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Odpojeno od účtů:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Účet %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Synchronizace účtu je vypnuta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Spustit všechny adresáře</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Pozastavit všechny adresáře</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Spustit veškerou synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Spustit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Pozastavit veškerou synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Pozastavit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Odhlásit ze všech účtů</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Přihlásit ke všem účtům...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Selhání</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<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="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronizuji %1 ze %2 (zbývá %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronizuji %1 (zbývá %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
- <translation><p>Verze %2. Pro další informace navštivte <a href="%3">%4</a></p><p><small>Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz a další.</small></p><p>Copyright ownCloud GmbH</p><p>Licencováno pod GNU General Public License (GPL) Version 2.0<br/>ownCloud a ownCloud logo jsou registrované obchodní známky ownCloud, Inc. ve Spojených státech, ostatních zemích nebo obojí</p></translation>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Textový štítek</translation>
</message>
<translation>Spustit novou synchroniza&ci (Smaže lokální data!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Vybrat co sesynchronizovat</translation>
</message>
<translation>Ses&ynchronizovat vše ze serveru</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Stavová zpráva</translation>
</message>
<translation>Formulář</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Uživatelské jméno</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Heslo</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Chybový popis</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Textový štítek</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>V budoucnosti</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>před %n dnem</numerusform><numerusform>před %n dny</numerusform><numerusform>před %n dny</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>před %n hodinou</numerusform><numerusform>před %n hodinami</numerusform><numerusform>před %n hodinami</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>nyní</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Méně než před minutou</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>před %n minutou</numerusform><numerusform>před %n minutami</numerusform><numerusform>před %n minutami</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Před nějakým časem</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n let</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n měsíc</numerusform><numerusform>%n měsíce</numerusform><numerusform>%n měsíců</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n den</numerusform><numerusform>%n dny</numerusform><numerusform>%n dní</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodin</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekund</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Sestaveno na Git revizi <a href="%1">%2</a> na %3, %4 s použitím Qt %5, %6</small></p></translation>
</message>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Neznámý</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>stahování</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>odesílání</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>mazání</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>přesouvání</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignoruji</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>chyba</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Die Zieldatei hat eine unerwartete Größe oder ein unerwartetes Änderungsdatum</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Anwenden</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
<translation>Verbunden mit <server> als <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Kein Konto konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Neues Konto hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Benutzerkonto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Zu synchronisierende Elemente auswählen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Ordner Synchronisation entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Ordner anlegen fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bestätigen Sie die Löschung der Ordner Sychronisation</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Ordner Synchronisation entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Synchronisation läuft</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 wird verwendet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 als <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Die Serververision %1 ist al und nicht unterstützt! Fortfahren auf eigenes Risiko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Verbunden mit %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<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="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Abgemeldet von %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Einloggen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Einige neue Ordner konnten nicht synchronisiert werden, da sie zu groß sind:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Konto wirklich entfernen?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Verbindung entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Ordner öffnen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Abmelden</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Synchronisation fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Synchronisation pausieren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 von %2 Serverkapazität verwendet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Server Aktivität</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Synchronisationsprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Liste von ignorierten oder feherhaften Dateien</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>nicht synchronisiert</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>nicht synchronisiert (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Die Server-Aktivitätsliste wurde in die Zwischenablage kopiert. </translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Die Synchronisationsliste wurde in die Zwischenablage kopiert.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Die Liste der unsynchronisierten Dateien wurde in die Zwischenablage kopiert.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>In die Zwischenablage kopiert</translation>
</message>
<translation><br/>Für Konto %1 sind serverseitig keine Aktivitäten aktiviert.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Sie haben %n neue Benachrichtigung von %2 erhalten.</numerusform><numerusform>Sie haben %n neue Benachrichtigungen von %2 erhalten.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Sie haben %n neue Benachrichtigung von %1 und %2 erhalten.</numerusform><numerusform>Sie haben %n neue Benachrichtigungen von %1 und %2 erhalten.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Sieh haben %n neue Benachrichtigungen von %1, %2 und anderen Konten erhalten.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Benachrichtigungen - Handlung notwendig</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokales Verzeichnis %1 existiert nicht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 sollte ein Ordner sein, ist es aber nicht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde gelöscht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde aktualisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 wurde in %2 umbenannt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 und %n andere Datei wurde gelöscht.</numerusform><numerusform>%1 und %n andere Dateien wurden gelöscht.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 und %n andere Datei wurde heruntergeladen.</numerusform><numerusform>%1 und %n andere Dateien wurden heruntergeladen.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 und %n andere Datei haben Konflikte beim Abgleichen.</numerusform><numerusform>%1 und %n andere Dateien haben Konflikte beim Abgleichen.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>Es gab einen Konflikt bei der Synchronisierung von %1. Bitte prüfen Sie die Konfliktdatei!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 und %n weitere Datei konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform><numerusform>%1 und %n weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Dieser Sync-Vorgang des Synchronisationsordners '%1' würde Dateien auf ein früheres Änderungsdatum zurücksetzen.
-Der Grund dafür ist möglicherweise, dass auf dem Server ein Backup eingespielt wurde.
-Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren Dateien als Konflikt-Dateien behalten?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Backup erkannt</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Normale Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Lokale Konfliktdateien behalten</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(Sicherung)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(Sicherung %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Wartet auf Beginn der Synchronistation</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Installationsfehler.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Kein gültige Ordner gewählt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 übrig, %1 von %2, Datei %3 von %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>Datei %1 von %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Warte...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Bereite Synchronisation vor...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<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/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Zeitüberschreitung der Verbindung</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Bitte Kennwort für %1 eingeben:
-
-Benutzer: %2
-Konto: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<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"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Passwort eingeben</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Zeitüberschreitung bei der Verbindung</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&E-Mail</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Verbinden mit %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Geben Sie die Benutzer-Anmeldeinformationen ein</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Erfolgreich mit %1 verbunden: %2 Version %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Die Verbindung zu %1 auf %2:<br/>%3 konnte nicht hergestellt werden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Zeitüberschreitung beim Verbindungsversuch mit %1 unter %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Verbindungsversuch mit %1 unter %2…</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Die Authentifizierungs-Anfrage an den Server wurde weitergeleitet an '%1'. Diese Adresse ist ungültig, der Server ist falsch konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Es gab eine ungültige Reaktion auf eine WebDav-Authentifizeriungs-Anfrage</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Zugang vom Server nicht erlaubt. <a href="%1">Klicken Sie hier</a> zum Zugriff auf den Dienst mithilfe Ihres Browsers, so dass Sie sicherstellen können, dass Ihr Zugang ordnungsgemäß funktioniert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokaler Sync-Ordner %1 existiert bereits, aktiviere Synchronistation.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Lokaler Synchronisations-Ordner %1 wird erstellt ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Der lokale Ordner %1 konnte nicht angelegt werden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Keinen entfernten Ordner angegeben!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Fehler: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>erstelle Ordner auf ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Remoteordner %1 erfolgreich erstellt.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Der Ordner %1 ist auf dem Server bereits vorhanden. Verbinde zur Synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehen Sie zurück und überprüfen Sie die Zugangsdaten.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Die Remote-Ordner-Erstellung ist fehlgeschlagen, vermutlich sind die angegebenen Zugangsdaten falsch.</font><br/>Bitte gehen Sie zurück und überprüfen Sie Ihre Zugangsdaten.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Eine Synchronisationsverbindung für Ordner %1 zum entfernten Ordner %2 wurde eingerichtet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Erfolgreich verbunden mit %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Die Verbindung zu %1 konnte nicht hergestellt werden. Bitte prüfen Sie die Einstellungen erneut.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Ordner umbenennen fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Der Ordner kann nicht entfernt und gesichert werden, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner oder die Datei oder beenden Sie die Installation.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokaler Sync-Ordner %1 erfolgreich erstellt!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Verbindungsassistent</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Ordner-Konfiguration überspringen</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Dieser Download würde den freien Speicher der Festplatte minimieren auf %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Der freie Speicher auf der Festplatte ist weniger als %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Die Datei wurde vom Server gelöscht</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>Die heruntergeladene Datei ist leer, obwohl der Server %1 als Größe übermittelt hat.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Datei ist seit der Entdeckung geändert worden</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>%1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht zu %2 umbenannt werden</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Er wurde zurück zum Originalnamen umbenannt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Dieser Ordner muss nicht umbenannt werden. Bitte benennen Sie es zurück wie in der Freigabe.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Die Datei wurde auf einer Nur-Lese-Freigabe umbenannt. Die Original-Datei wurde wiederhergestellt.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Datei gelöscht</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Eine lokale Datei wurde während der Synchronisation geändert.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Poll-URL fehlt</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Die lokale Datei wurde während der Synchronisation gelöscht.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Der Server hat den letzten Block nicht bestätigt. (Der E-Tag war nicht vorhanden)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>ownCloud-Pfad:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1-Freigabe</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Ordner: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Der Server erlaubt das teilen nicht</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Abrufen der maximal möglichen Freigabeberechtigungen vom Server...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>&Link kopieren</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Bearbeitung erlauben</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Passwort geschützt</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>passwortgeschützt</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Öffentliches Teilen erfordert ein P&asswort</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Bitte wählen Sie ein Passwort:</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Link teilen</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Log-In Fehler</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Erfolgreich</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync konnte keinen Speicher reservieren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync hat einen schwerwiegender Parameterfehler festgestellt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>CSync Verarbeitungsschritt "Aktualisierung" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync Verarbeitungsschritt "Abgleich" fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<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="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Fehler beim Lesen eines Ordners.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Datei wird ignoriert, weil sie versteckt ist.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync unbekannter Fehler.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Abbruch durch den Benutzer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync-Zugriff fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync wegen fehlender Berechtigung fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<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="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<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="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Zugriff verboten</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Der Dateiname ist zu lang.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Stat fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Dateikodierung ist ungültig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation>Synchronisationsbericht konnte nicht initialisiert werden.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Fehler beim Einlesen der Blacklist aus der lokalen Datenbank</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Löschen nicht erlaubt, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Verschieben nicht erlaubt, Element wiederhergestellt</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>Das Ziel</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>Die Quelle</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Version %1. Für weitere Informationen besuchen Sie bitte <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Zur Verfügung gestellt durch %1 und lizenziert unter der GNU General Public License (GPL) Version 2.0.<br>%2 und das %2 Logo sind eingetragene Warenzeichen von %1 in den Vereinigten Staaten, anderen Ländern oder beides.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Bitte melden Sie sich an</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Ordner %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Keine Sync-Ordner konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Es wurden keine Synchonisationsordner konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Einloggen...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Abmelden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Letzte Änderungen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Nach Änderungen suchen in '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Verwaltete Ordner:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Ordner »%1« öffnen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>%1 im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Unbekannter Status</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Einstellungen …</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Details …</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>%1 beenden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Von %1 trennen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>nicht unterstütze Server Version</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Der Server mit Konto %1 läuft mit einer alten und nicht unterstützten Version %2. Die Verwendung dieses Clienten mit der nicht unterstützten Serverversion ist ungetestet und möglicherweiße gefährich. Fortfahren auf eigenes Risiko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Getrennt von Konten:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Account Synchronisation ist deaktiviert</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Setze alle Ordner fort</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Stoppe alle Ordner</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Setze gesamte Synchronisation fort</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Setze Synchronisation fort</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Stoppe gesamte Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Stoppe Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Bei allen Konten abmelden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Bei allen Konten anmelden...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Jetzt abstürzen lassen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Keine kürzlich synchronisierten Elemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronisiere %1 von %2 (%3 übrig)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronisiere %1 (%2 übrig)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Aktuell</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
- <translation><p>Version %2. Weitere Informationen unter <a href="%3">%4</a></p><p><small>Von Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz und anderen.</small></p><p>Copyright ownCloud GmbH</p><p>Lizensiert unter den Bedingungen der GNU General Public License (GPL) Version 2.0<br/>ownCloud und das ownCloud Logo sind eingetragene Warenzeichen der ownCloud Inc. in den USA, anderen Ländern, oder beidem.</p></translation>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Saubere Syn&chronisation beginnen (entfernt lokalen Ordner!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Zu synchronisierende Elemente auswählen</translation>
</message>
<translation>Alle Daten vom Server s&ynchronisieren</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Statusnachricht</translation>
</message>
<translation>Formular</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Benutzername</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Passwort</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Fehler-Label</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>TextLabel</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>in der Zukunft</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>vor %n Tage(n)</numerusform><numerusform>vor %n Tage(n)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>vor %n Stunde(n)</numerusform><numerusform>vor %n Stunde(n)</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>jetzt</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>vor weniger als einer Minute</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>vor %n Minute(n)</numerusform><numerusform>vor %n Minute(n)</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>vor einiger Zeit</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n Jahr</numerusform><numerusform>%n Jahre</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n Monat</numerusform><numerusform>%n Monate</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n Tag</numerusform><numerusform>%n Tage</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n Stunde</numerusform><numerusform>%n Stunden</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n Minute</numerusform><numerusform>%n Minuten</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n Sekunde</numerusform><numerusform>%n Sekunden</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Gebaut von der GIT-Revision <a href="%1">%2</a> auf %3, %4 verwendet Qt %5, %6</small></p></translation>
</message>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Unbekannt</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>Herunterladen</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>Lade hoch</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>Lösche</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>Verschiebe</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignoriere</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>Fehler</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Το αρχείο προορισμού έχει μη αναμενόμενο μέγεθος ή ημερομηνία τροποποίησης</translation>
</message>
<translation>Οι μη επιλεγμένοι φάκελοι θα <b>αφαιρεθούν</ b> από το τοπικό σύστημα αρχείων σας και δεν θα συγχρονιστούν πια με αυτόν τον υπολογιστή</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Εφαρμογή</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Άκυρο</translation>
</message>
<translation>Συνδεδεμένοι με το <server> ως <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Δεν ρυθμίστηκε λογαριασμός.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Προσθήκη νέου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Αφαίρεση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Λογαριασμός</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Επιλέξτε τι θα συγχρονιστεί</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Αποτυχία αφαίρεσης φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Επιβεβαίωση αφαίρεσης σύνδεσης συγχρονισμού φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Εκτελείται Συγχρονισμός </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 σε χρήση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 ως <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Η έκδοση του διακομιστή %1 είναι παλιά και δεν υποστηρίζεται! Προχωρείστε με δική σας ευθύνη.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Συνδεδεμένο με %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Ο διακομιστής %1 δεν είναι διαθέσιμος προσωρινά.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Αποσυνδέθηκε από %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation>Δεν υπάρχει σύνδεση με το %1 στο %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Είσοδος</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Υπάρχουν νέοι φάκελοι που δεν συγχρονίστηκαν καθώς είναι πολύ μεγάλοι:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Αφαίρεση σύνδεσης</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Άνοιγμα φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Συνέχιση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Παύση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 από %2 σε χρήση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Δραστηριότητα διακομιστή</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Προτοκολο συγχρονισμου</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Κατάλογος αρχείων που αγνοούνται ή περιέχουν σφάλματα</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Αντιγραφή</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Δεν είναι συγχρονισμένα</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Δεν είναι συγχρονισμένα (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Ο κατάλογος δραστηριοτήτων του διακομιστή έχει αντιγραφθεί στο Πρόχειρο</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Ο κατάλογος της δραστηριότητας συγχρονισμού έχει αντιγραφθεί στο Πρόχειρο</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Ο κατάλογος των μη-συγχρονισμένων αρχείων έχει αντιγραφθεί στο Πρόχειρο</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Αντιγράφηκε στο πρόχειρο</translation>
</message>
<translation><br/>Ο λογαριασμός %1 δεν έχει ενεργοποιήσει τις δραστηριότητες.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation>Ματαιώθηκε από το χρήστη</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>Το %1 θα έπρεπε να είναι φάκελος αλλά δεν είναι.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation> Το %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 αφαιρέθηκε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ληφθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Το %1 έχει μετονομαστεί σε %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>Το %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 δεν ήταν δυνατό να συγχρονιστεί εξαιτίας ενός σφάλματος. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Ανιχνεύθηκε αντίγραφο ασφαλείας</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(αντίγραφο ασφαλείας)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(αντίγραοφ ασφαλέιας %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη Κατάσταση.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Παύση συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμού)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>αρχείο %1 από %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Αναμονή...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Προετοιμασία για συγχρονισμό...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Δεν ελήφθη E-Tag από το διακομιστή, ελέγξτε το διακομιστή μεσολάβησης/πύλη</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ελήφθη διαφορετικό E-Tag για συνέχιση. Επανάληψη την επόμενη φορά.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Παρακαλούμε εισάγετε τον κωδικό %1:
-
-Χρήστης: %2
-Λογαριασμός: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>Η ανάγνωση από την κλειδοθήκη απέτυχε με σφάλμα: '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Εισάγετε Κωδικό Πρόσβασης</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Η σύνδεση έληξε.</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Σύνδεση με %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Εισάγετε διαπιστευτήρια χρήστη</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Επιτυχής σύνδεση στο %1: %2 έκδοση %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Αποτυχία σύνδεσης με το %1 στο %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Λήξη χρονικού ορίου κατά τη σύνδεση σε %1 σε %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Προσπάθεια σύνδεσης στο %1 για %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Η πιστοποιημένη αίτηση στον διακομιστή ανακατευθύνθηκε σε '%1'. Το URL είναι εσφαλμένο, ο διακομιστής δεν έχει διαμορφωθεί σωστά.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Υπήρξε μια άκυρη απόκριση σε μια πιστοποιημένη αίτηση </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Απαγόρευση πρόσβασης από τον διακομιστή. Για να επιβεβαιώσετε ότι έχετε δικαιώματα πρόσβασης, <a href="%1">πατήστε εδώ</a> για να προσπελάσετε την υπηρεσία με το πρόγραμμα πλοήγησής σας.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Ο τοπικός φάκελος συγχρονισμού %1 υπάρχει ήδη, ρύθμιση για συγχρονισμό.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Δημιουργία τοπικού φακέλου συγχρονισμού %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>οκ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>απέτυχε.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Αδυναμία δημιουργίας τοπικού φακέλου %1 </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Δεν προσδιορίστηκε κανένας απομακρυσμένος φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Σφάλμα: %1 </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>δημιουργία φακέλου στο ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Ο απομακρυσμένος φάκελος %1 δημιουργήθηκε με επιτυχία.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Ο απομακρυσμένος φάκελος %1 υπάρχει ήδη. Θα συνδεθεί για συγχρονισμό. </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Η δημιουργία φακέλου είχε ως αποτέλεσμα τον κωδικό σφάλματος HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Η δημιουργία απομακρυσμένου φακέλλου απέτυχε επειδή τα διαπιστευτήρια είναι λάθος!<br/>Παρακαλώ επιστρέψετε και ελέγξετε τα διαπιστευτήριά σας.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Η δημιουργία απομακρυσμένου φακέλου απέτυχε, πιθανώς επειδή τα διαπιστευτήρια που δόθηκαν είναι λάθος.</font><br/>Παρακαλώ επιστρέψτε πίσω και ελέγξτε τα διαπιστευτήρια σας.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Η δημιουργία απομακρυσμένου φακέλου %1 απέτυχε με σφάλμα <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Μια σύνδεση συγχρονισμού από τον απομακρυσμένο κατάλογο %1 σε %2 έχει ρυθμιστεί. </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Επιτυχής σύνδεση με %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Αποτυχία μετονομασίας φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας του φακέλου διότι ο φάκελος ή ένα αρχείο του είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Επιτυχής δημιουργία τοπικού φακέλου %1 για συγχρονισμό!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Οδηγός Σύνδεσης</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Παράλειψη διαμόρφωσης φακέλων</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Η λήψη θα μειώσει το διαθέσιμο χώρο στο δίσκο κάτω από %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Ο διαθέσιμος χώρος στο δίσκο είναι λιγότερος από %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Το αρχείο διαγράφηκε από τον διακομιστή</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
- <translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Το αρχείο %1 δεν είναι δυνατό να μετονομαστεί σε %2 λόγω μιας διένεξης με το όνομα ενός τοπικού αρχείου</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Μετονομάζεται πίσω στο αρχικό του όνομα.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Αυτός ο φάκελος δεν πρέπει να μετονομαστεί. Παρακαλώ ονομάστε τον ξανά Κοινόχρηστος.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Το αρχείο μετονομάστηκε αλλά είναι τμήμα ενός διαμοιρασμένου καταλόγου μόνο για ανάγνωση. Το αρχικό αρχείο επαναφέρθηκε.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 201, αλλά ελήφθη "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Το αρχείο αφαιρέθηκε</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τη διάρκεια του συγχρονισμού. Θα συγχρονιστεί πάλι.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Το τοπικό αρχείο τροποποιήθηκε κατά τον συγχρονισμό.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation>Εξαναγκασμός ακύρωσης εργασίας στην επαναφορά σύνδεσης HTTP με Qt < 5.4.2</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Η διεύθυνση poll URL λείπει</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Το τοπικό αρχείο αφαιρέθηκε κατά το συγχρονισμό.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Ο διακομιστής δεν αναγνώρισε το τελευταίο τμήμα. (Δεν υπήρχε e-tag)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Διαδρομή ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 Διαμοιράστηκε</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Φάκελος: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Ο διακομιστής δεν επιτρέπει τον διαμοιρασμό</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Το αρχείο δεν μπορεί να διαμοιραστεί γιατί διαμοιράστηκε χωρίς δικαιώματα διαμοιρασμού.</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Αντιγραφή &συνδέσμου</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Επιτρέπεται η επεξεργασία</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Π&ροστασία με κωδικό</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Προστατευμένο με κωδικό πρόσβασης</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Το αρχείο δεν μπορεί να διαμοιραστεί γιατί διαμοιράστηκε χωρίς δικαιώματα διαμοιρασμού.</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Ο δημόσιος &διαμοιρασμός απαιτεί κωδικό πρόσβασης</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Παρακαλούμε ορίστε Κωδικό</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>Δ&ιαμοιρασμός συνδέσμου</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Σφάλμα Σύνδεσης</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Επιτυχία.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync got an error while processing internal trees.</source>
<translation>Το CSync έλαβε κάποιο μήνυμα λάθους κατά την επεξεργασία της εσωτερικής διεργασίας.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>Το CSync απέτυχε να δεσμεύσει μνήμη.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Μοιραίο σφάλμα παράμετρου CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>Η ενημέρωση του βήματος επεξεργασίας του CSync απέτυχε.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync στάδιο επεξεργασίας συμφιλίωση απέτυχε. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>Το CSync δεν μπόρεσε να πιστοποιηθεί στο διακομιστή μεσολάβησης.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>Το CSync απέτυχε να διερευνήσει το διαμεσολαβητή ή το διακομιστή.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>Το CSync απέτυχε να πιστοποιηθεί στο διακομιστή 1%. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>CSync failed to connect to the network.</source>
<translation>Το CSync απέτυχε να συνδεθεί με το δίκτυο.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>Διακοπή σύνδεσης δικτύου λόγω παρέλευσης χρονικού ορίου.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>Ένα σφάλμα μετάδοσης HTTP συνέβη.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Ο προσαρτημένος φάκελος δεν είναι διαθέσιμος στον δικομιστή προσωρινά</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>Παρουσιάστηκε σφάλμα κατά το άνοιγμα του φακέλου</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Σφάλμα κατά την ανάγνωση του φακέλου.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Το Αρχείο/ο Φάκελος αγνοήθηκε επειδή είναι κρυφό.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Δεν υπάρχει διαθέσιμος χώρος στο διακομιστή 1%.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Άγνωστο σφάλμα CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Ματαιώθηκε από το χρήστη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Το όνομα αρχείου περιέχει χαρακτήρες που δεν μπορούν να συγχρονιστούν σε όλα τα συστήματα.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>Το CSync απέτυχε να αποκτήσει πρόσβαση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>Το CSync απέτυχε λόγω κατάστασης "permission denied"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>Το CSync προσπάθησε να δημιουργήσει φάκελο που υπάρχει ήδη.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Η υπηρεσία δεν είναι διαθέσιμη προσωρινά</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Δεν επιτρέπεται η πρόσβαση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>Προέκυψε ένα εσωτερικό σφάλμα με αριθμό %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Το αντικείμενο δεν είναι συγχρονισμένο λόγω προηγούμενων σφαλμάτων: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Απέτυχε.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Μη έγκυροι χαρακτήρες, παρακαλώ μετονομάστε το "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation>Αδυναμία προετοιμασίας αρχείου συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Αδυναμία ανάγνωσης της μαύρης λίστας από την τοπική βάση δεδομένων</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Το όνομα αρχείου περιέχει έναν τουλάχιστον μη έγκυρο χαρακτήρα</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας "διάλεξε τι να συγχρονιστεί"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>Οι τοπικοί φάκελοι και ο φάκελος κοινής χρήσης αφαιρέθηκαν.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Η μετακίνηση δεν επιτρέπεται, το αντικείμενο αποκαταστάθηκε</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Η μετακίνηση δεν επιτρέπεται επειδή το %1 είναι μόνο για ανάγνωση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>ο προορισμός</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>η προέλευση</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Έκδοση %1. Για περισσότερες πληροφορίες δείτε <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Διανέμεται από 1% και υπό την άδεια GNU General Public License (GPL) έκδοση 2.0.<br/>% 2 και το 2% το λογότυπο είναι σήματα κατατεθέντα της 1% στις Ηνωμένες Πολιτείες, άλλες χώρες, ή και τα δύο.</ p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Παρκαλώ συνδεθείτε</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Φάκελος %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Δεν έχουν οριστεί φάκελοι συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Δεν έχουν ρυθμιστεί φάκελοι συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Άνοιγμα στον περιηγητή ιστού</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Σύνδεση...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Πρόσφατες Αλλαγές</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Έλεγχος αλλαγών στο '%1'.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Φάκελοι υπό Διαχείριση:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Άνοιγμα φακέλου '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Άνοιγμα %1 στον περιηγητή</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Άγνωστη κατάσταση</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Ρυθμίσεις...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Λεπτομέρειες...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Βοήθεια</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Κλείσιμο %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Αποσυνδέθηκε από %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Μη υποστηριζόμενη έκδοση διακομιστή</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Αποσυνδέθηκε από τους λογαριασμούς:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Λογαριασμός %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Ο λογαριασμός συγχρονισμού έχει απενεργοποιηθεί</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Αναίρεση παύσης όλων των φακέλων</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Παύση όλων των φακέλων</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Αναίρεση παύσης όλων των συγχρονισμών</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Αναίρεση παύσης συγχρονσμού</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Παύση όλων των συγχρονισμών</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Παύση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Έξοδος από όλους τους λογαριασμούς</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Είσοδος σε όλους τους λογαριασμούς</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Κατάρρευση τώρα</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Συγχρονισμός %1 από %2 (%3 απομένουν)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Συγχρονισμός %1 (%2 απομένουν)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Ενημερωμένο</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>&Έναρξη καθαρού συγχρονισμού (Διαγράφει τον τοπικό φάκελο!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Επιλέξτε τι θα συγχρονιστεί</translation>
</message>
<translation>Σ&υγχρονισμός όλων από τον διακομιστή</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Μήνυμα κατάστασης</translation>
</message>
<translation>Φόρμα</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Όνομα Χρήστη</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Κωδικός Πρόσβασης</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Ετικέτα Σφάλματος</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>TextLabel</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>στο μέλλον</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>τώρα</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Λιγότερο από ένα λεπτό πριν</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n χρόνος</numerusform><numerusform>%n χρόνια</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Δημιουργήθηκε από την διασκευή Git <a href="%1">%2</a> στο %3, %4 χρησιμοποιώντας Qt %5, %6</small></p></translation>
</message>
<translation>Σφάλμα</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Άγνωστο</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>λήψη</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>μεταφόρτωση</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>διαγραφή</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>μετακίνηση</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>αγνοείται</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>σφάλμα </translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<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="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"></translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync got an error while processing internal trees.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>CSync failed to connect to the network.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>CSync: No space on %1 server available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
- <source>Filename is too long.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <source>Filename is too long.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation type="unfinished"></translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"></translation>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation type="unfinished"></translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation type="unfinished"></translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished">
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation type="unfinished"></translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"></translation>
</message>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>El archivo destino tiene un tamaño o fecha/hora de modificación no esperado.</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Conectado a <server> como <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>No se ha configurado ninguna cuenta.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Añadir nuevo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Eliminar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Elija qué sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la sincronización de carpetas conectadas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Hubo un fallo al crear la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirme la sincronización para la eliminación de la carpeta conectada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar carpeta de sincronización conectada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 como <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>La versión del servidor %1 es antigua, ¡y no está soportada! Si continúas, lo haces bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Servidor %1 no está disponible temporalmente.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Cerró sesión desde %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas nuevas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Confirmar eliminación de cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Continuar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Actividad del servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protocolo de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Lista de archivos erróneos o ignorados</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copie la lista de actividades al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>No sincronizado</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>No Sincronizado (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>La lista de la actividad del servidor se ha copiado en el portapapeles.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>La lista de actividades de sincronización se ha copiado en el portapapeles.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>La lista de elementos no sincronizados se ha copiado al portapapeles.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
<translation><br/>La cuenta %1 no tiene actividades habilitadas.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Ha recibido %n nueva notificación de %2.</numerusform><numerusform>Ha recibido %n nueva notificacióne(s) de %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Ha recibido %n nueva notificación de %1 y de %2.</numerusform><numerusform>Ha recibido %n nuevas notificacióne(s) de %1 y de %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Ha recibido nuevas notificaciónes de %1, %2 y otras cuentas.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Notificaciones - Acción requerida</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>La carpeta local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ha sido renombrado a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 y otro archivo han sido borrados.</numerusform><numerusform>%1 y otros %n archivos han sido borrados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 y otro archivo han sido descargados.</numerusform><numerusform>%1 y otros %n archivos han sido descargados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y otro archivo han sido actualizados.</numerusform><numerusform>%1 y otros %n archivos han sido actualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado a %2 y otro archivo ha sido renombrado.</numerusform><numerusform>%1 ha sido renombrado a %2 y otros %n archivos han sido renombrado.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ha sido movido a %2 y otro archivo ha sido movido.</numerusform><numerusform>%1 ha sido movido a %2 y otros %n archivos han sido movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 y otro archivo han tenido conflictos al sincronizar.</numerusform><numerusform>%1 y otros %n archivos han tenido conflictos al sincronizar.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>Conflicto al sincronizar %1. Por favor compruebe el archivo!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 y otro archivo no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform><numerusform>%1 y otros %n archivos no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no pudo ser sincronizado debido a un error. Para más detalles, vea el registro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Actividad de la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Esta sincronización reseteará el estado de los archivos en la carpeta '%1'.
-esto es similar a restaurar un backup en el servidor.
-Continuar con la sincronización hará que todos los archivos sean sobreescritos con versiones anteriores de los mismos. Desea mantener los archivos locales sin cambios en caso de conflicto?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los archivos locales en caso de conflicto</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<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="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(copia de seguridad)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(copia de seguridad %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Esperando para comenzar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<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="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Interrumpido por el usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>¡La carpeta seleccionada no es válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 restantes, %1 de %2, archivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>archivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>El servidor ha devuelto un content-range erróneo</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Tiempo de espera de conexión agotado</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Por favor introduzca la contraseña de %1:
-
-Usuario: %2
-Cuenta: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<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"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Introduzca la contraseña</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Tiempo de conexión agotado</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&Email</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Conectar a %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Introduzca las credenciales de usuario</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Conectado con éxito a %1: versión %2 %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Fallo al conectar %1 a %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Tiempo de espera agotado mientras se intentaba conectar a %1 en %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Intentando conectar a %1 desde %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>La petición autenticada al servidor ha sido redirigida a '%1'. La dirección URL es errónea, el servidor está mal configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Ha habido una respuesta no válida a una solicitud autenticada de webdav</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Acceso denegado por el servidor. Para verificar que usted tiene acceso, <a href="%1">haga clic aquí</a> para acceder al servicio con su navegador.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>La carpeta de sincronización local %1 ya existe, configurándola para la sincronización.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Creando carpeta de sincronización local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>bien</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>ha fallado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>No se ha podido crear la carpeta local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>¡No se ha especificado ninguna carpeta remota!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>creando carpeta en ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Carpeta remota %1 creado correctamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>La carpeta remota %1 ya existe. Conectándola para sincronizacion.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La creación de la carpeta ha producido el código de error HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!<br/>Por favor, vuelva atrás y compruebe sus credenciales</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">La creación de la carpeta remota ha fallado, probablemente porque las credenciales proporcionadas son incorrectas.</font><br/>Por favor, vuelva atrás y compruebe sus credenciales.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Creación %1 de carpeta remota ha fallado con el error <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Se ha configarado una conexión de sincronización desde %1 al directorio remoto %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>¡Conectado con éxito a %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>No se ha podido establecer la conexión con %1. Por favor, compruébelo de nuevo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Error al renombrar la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>No se puede eliminar y respaldar la carpeta porque la misma o un fichero en ella está abierto por otro programa. Por favor, cierre la carpeta o el fichero y reintente, o cancele la instalación.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Carpeta de sincronización local %1 creada con éxito</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>Asistente de conexión %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Omitir la configuración de carpetas</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>La descarga reduciría el espacio libre en disco por debajo de %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>El espacio libre en el disco es inferior a %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Se ha eliminado el archivo del servidor</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>No se ha podido descargar el archivo completamente.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>El archivo descargado está vacio aunque el servidor dice que deberia haber sido %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>El archivo ha cambiado desde que fue descubierto</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Error al escribir los metadatos en la base de datos</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>El archivo %1 no se puede renombrar a %2 por causa de un conflicto con el nombre de un archivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta carpeta no debe ser renombrada. Ha sido renombrada a su nombre original</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta carpeta no debe ser renombrada. Favor de renombrar a Compartida.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>El archivo fue renombrado, pero es parte de una carpeta compartida en modo de solo lectura. El archivo original ha sido recuperado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>El código HTTP devuelto por el servidor es erróneo. Esperado 201, pero recibido "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Archivo eliminado</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Archivo local cambió durante la sincronización. Será actualizado.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Un archivo local fue modificado durante la sincronización.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Falta la URL de la encuesta</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>El archivo local ha sido eliminado durante la sincronización.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>El servidor no reconoció la última parte. (No había una e-tag presente)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Error al escribir los metadatos en la base de datos</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Ruta de OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 Compartiendo</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Carpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>El servidor no permite compartir</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Descargando el maximo número de permisos compartidos del servidor...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Copiar &enlace</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Permitir edición</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Protegido por contr&aseña </translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Protegido con contraseña</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Compartir public&amente requiere contraseña</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Por favor establece una contraseña</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Compartir enlace</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Error al iniciar sesión</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Completado con éxito.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de parámetro en CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<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="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Error al leer el directorio.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Se ignoran los Archivos/Carpetas ocultos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Solo %1 disponible, se necesita por lo menos %2 para comenzar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync ha fallado al acceder</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync falló debido a un permiso denegado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<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="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>El servicio no está disponible temporalmente </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Acceso prohibido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>El nombre del archivo es demasiado largo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Stat ha fallado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<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="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>No se pudo leer la lista de bloqueo de la base de datos local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>No se ha podido leer desde el registro de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<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="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Nombre de archivo contiene al menos un caracter no válido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ignorado porque se encuentra en la lista negra de "elija qué va a sincronizar"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>No está permitido mover, elemento restaurado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>origen</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>La versión %1. Para obtener más información, visite<a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuido por %1 y bajo la licencia GNU General Public License (GPL) versión 2.0.<br/>%2 y el logotipo de %2 son marcas registradas de %1 en los Estados Unidos y otros países, o ambos.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Por favor, regístrese</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Archivo %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>No hay carpetas de sincronización configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>No hay carpetas configuradas para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Abrir en navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Inicio de sesión...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Buscando cambios en '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Carpetas administradas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Abrir carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Salir de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Versión del servidor no soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor en la cuenta %1 usa una versión antigua y no soportada %2. Usando este cliente con las versiones de servidor no soportadas no está probado y es potencialmente peligroso. Procede bajo tu propio riesgo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado desde cuentas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Cuenta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Despausar todas las carpetas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Pausar todas las carpetas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Despausar todas las sincronizaciones</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Despausar la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Pausar todas las sincronizaciones</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Pausar la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Terminar sessión en todas las cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Iniciar sesión en todas las cuentas...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Se ha producido un fallo</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>No se han sincronizado elementos recientemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizando %1 de %2 (quedan %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (quedan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
- <translation><p>Version %2. Para más información visita <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></translation>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<translation>Empezar con una sincronización &limpia (¡Elimina la carpeta local!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Elija qué sincronizar</translation>
</message>
<translation>Sincronizar todo desde el servidor</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Mensaje de estado</translation>
</message>
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Nombre de usuario</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Contraseña</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Etiqueta de error</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Texto de un etiqueta</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>en el futuro</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>Hace %n día(s)</numerusform><numerusform>Hace %n día(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>Hace %n hora(s)</numerusform><numerusform>Hace %n hora(s)</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>ahora</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Hace menos de un minuto</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>Hace %n minutos(s)</numerusform><numerusform>Hace %n minutos(s)</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Hace unos momentos</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n año</numerusform><numerusform>%n año(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n Mes</numerusform><numerusform>%n Mese(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n dia</numerusform><numerusform>%n dia(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n hora(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuto</numerusform><numerusform>%n minuto(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n segundo</numerusform><numerusform>%n segundo(s)</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Revisión Git <a href="%1">%2</a> en %3, %4 compilada usando Qt %5, %6</small></p></translation>
</message>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Desconocido</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>subiendo</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>eliminando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>moviendo</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>error</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>El archivo de destino tiene un tamaño o fecha de modificación inesperado</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Conectado con <server> como <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>No hay cuenta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Falló la creacion de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 de <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Conectado a %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<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="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Registrado desde %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<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="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Confirmar la eliminación de la cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Cerrar la sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Reanudar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protocolo de Sincronización</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar la lista de actividades al portapapeles.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Copiado al portapapeles</translation>
</message>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>El directorio local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 debé ser una carpeta pero no lo es.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>No se pudo </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>Archivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Ingresar contraseña</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Tiempo de conexión agotado</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Conectar a %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Ingresá las credenciales de usuario</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Conectado a %1: versión de %2 %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Falló al conectarse a %1 en %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Tiempo excedido mientras se intentaba conectar a %1 desde %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Intentando conectar a %1 en %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>El directorio de sincronización local %1 ya existe, configurándolo para la sincronización.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>aceptar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>Error.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>No fue posible crear el directorio local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>¡No se ha especificado un directorio remoto!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>Creando carpeta en ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>El directorio remoto %1 fue creado con éxito.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>El directorio remoto %1 ya existe. Estableciendo conexión para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La creación del directorio resultó en un error HTTP con código de error %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Error al crear el directorio remoto porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Error al crear el directorio remoto, probablemente porque las credenciales provistas son incorrectas.</font><br/>Por favor, volvé atrás y verificá tus credenciales.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Se prtodujo un error <tt>%2</tt> al crear el directorio remoto %1.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Fue creada una conexión de sincronización desde %1 al directorio remoto %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Conectado con éxito a %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>No fue posible establecer la conexión a %1. Por favor, intentalo nuevamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Error Al Renombrar Directorio</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Directorio local %1 creado</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Asistente de Conexión</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Éxito.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync falló al reservar memoria.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Error fatal de parámetro en CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Error no especificado de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Interrumpido por el usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
- <source>Filename is too long.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <source>Filename is too long.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Por favor, inicie sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Directorio %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Los directorios de sincronización no están configurados.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Cerrar la sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Directorios administrados:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Abrir carpeta '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Cancelar %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>No se sincronizaron elementos recientemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>actualizado</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>EtiquetaDeTexto</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Mensaje de estado</translation>
</message>
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Nombre de usuario</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Contraseña</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Etiqueta de error</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>EtiquetaDeTexto</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Desconocido</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>subiendo</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>Eliminado</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>Movido</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorado</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>error</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Sihtkausta fail on ootamatu suuruse või muutmise ajaga</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Rakenda</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Loobu</translation>
</message>
<translation>Ühendatud <server> kasutajana <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Ühtegi kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Lisa uus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Eemalda</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Vali, mida sünkroniseerida</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Kausta loomine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Sünkroniseerimine on käimas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 kasutusel</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 as <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Ühendatud %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 pole ajutiselt saadaval.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Logi sisse</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<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="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Kinnita konto eemaldamine</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Eemalda ühendus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Ava kaust</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Logi välja</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Taasta sünroonimist</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Peata sünkroonimine</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Serveri aktiivsus</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Sünkroniseerimisprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopeeri</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopeeri tegevuste nimistu puhvrisse.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Pole sünkroonitud</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Kopeeritud lõikepuhvrisse</translation>
</message>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Kohalikku kausta %1 pole olemas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on eemaldatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on uuendatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on ümber nimetatud %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 sünkroniseerimine ebaõnnestus tõrke tõttu. Lisainfot vaata logist.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Leiti varukoopia</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Tavaline sünkroonimine</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Ei suutnud tühistada kataloogi staatust</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(varukoopia)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation> (varukoopia %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Oodatakse sünkroonimise alustamist.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Sobilikku kausta pole valitud!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>Valitud asukoht pole kaust!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>fail %1 / %2-st</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Ootamine...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Sünkroniseerimiseks valmistumine...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Server tagastas vale vahemiku</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Ühenduse aegumine</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Sisesta parool</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Ühendus aegus</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Ühendu %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Sisesta kasutajaandmed</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Edukalt ühendatud %1: %2 versioon %3 (4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Ühendumine ebaõnnestus %1 %2-st:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Püüan ühenduda %1 kohast %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Kohalik kataloog %1 on juba olemas. Valmistan selle ette sünkroniseerimiseks.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Kohaliku kausta %1 sünkroonimise loomine ... </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Ei suuda tekitada kohalikku kataloogi %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Ühtegi võrgukataloogi pole määratletud!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Viga: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>loon uue kataloogi ownCloudi: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Eemalolev kaust %1 on loodud.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Serveris on kataloog %1 juba olemas. Ühendan selle sünkroniseerimiseks.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Kausta tekitamine lõppes HTTP veakoodiga %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Kataloogi loomine serverisse ebaõnnestus, kuna kasutajatõendid on valed!<br/>Palun kontrolli oma kasutajatunnust ja parooli.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Serveris oleva kataloogi tekitamine ebaõnnestus tõenäoliselt valede kasutajatunnuste tõttu.</font><br/>Palun mine tagasi ning kontrolli kasutajatunnust ning parooli.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Kataloogi %1 tekitamine serverisse ebaõnnestus veaga <tt>%2</tt></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Loodi sünkroniseerimisühendus kataloogist %1 serveri kataloogi %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Edukalt ühendatud %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Ühenduse loomine %1 ebaõnnestus. Palun kontrolli uuesti.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Kataloogi ümbernimetamine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Ei suuda eemaldada ning varundada kataloogi kuna kataloog või selles asuv fail on avatud mõne teise programmi poolt. Palun sulge kataloog või fail ning proovi uuesti või katkesta paigaldus.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Kohalik kataloog %1 edukalt loodud!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 seadistamise juhendaja</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Jäta kaustade seadistamine vahele</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Fail on serverist kustutatud</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Faili täielik allalaadimine ebaõnnestus.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Faili on pärast avastamist muudetud</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<translation>Faili %1 ei saa ümber nimetada %2-ks, kuna on konflikt kohaliku faili nimega</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Kausta ei tohi ümber nimetada. Kausta algne nimi taastati.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Kausta nime ei tohi muuta. Palun pane selle nimeks tagasi Shared.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Fail oli ümber nimetatud, kuid see on osa kirjutamisõiguseta jagamisest. Algne fail taastati.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Server saatis vale HTTP koodi. Ootuspärane kood oli 201, aga saadeti kood "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Fail eemaldatud</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Kohalik fail muutus sünkroniseeringu käigus. See taastakse.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Kohalik fail muutus sünkroniseeringu käigus.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Küsitluse URL puudub</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Kohalik fail on eemaldatud sünkroniseeringu käigus.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<translation>ownCloudi kaust:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 jagamine</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Kaust: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>See server ei luba jagamist</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Kopeeri &link</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Luba muutmine</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>P&arooliga kaitstud</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Parooliga kaitstud</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Avalik j&agamine nõuab parooli</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Palun määra parool</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Jaga linki</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Sisselogimise viga</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Korras.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ei suutnud mälu reserveerida.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync parameetri saatuslik viga.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>CSync uuendusprotsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync tasakaalustuse protsess ebaõnnestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>Toimus võrgukatkestus.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP ülekande viga.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync tuvastamatu viga.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Kasutaja poolt tühistatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSyncile ligipääs ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Teenus pole ajutiselt saadaval</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Ligipääs on keelatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Faili nimi on liiga pikk.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Failinime kodeering pole kehtiv</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Ei suuda avada sünkroniseeringu zurnaali</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Faili nimesonvähemalt üks keelatud märk</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Eemaldamine pole lubatud, taastan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Liigutamine pole lubatud, üksus taastatud</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>sihtkoht</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>allikas</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Palun logi sisse</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Kaust %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Sünkroniseeritavaid kaustasid pole seadistatud.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Sünkroniseeritavaid kaustasid pole määratud.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Ava veebilehitsejas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Logi sisse...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Logi välja</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Hiljutised muudatused</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Kontrollitakse muudatusi kaustas '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Hallatavad kaustad:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Ava kaust '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Ava %1 veebilehitsejas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Tundmatu staatus</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Seaded...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Üksikasjad...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Abiinfo</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Lõpeta %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Kontodest lahtiühendatud</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Logi välja kõikidelt kontodelt</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Logi sisse kõikidesse kontodesse...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Jookse kokku</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Ühtegi üksust pole hiljuti sünkroniseeritud</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sünkroniseerin %1 %2-st (%3 veel)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sünkroniseerin %1 (%2 veel)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Ajakohane</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Tekstisilt</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Vali, mida sünkroniseerida</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Staatuse teade</translation>
</message>
<translation>Vorm</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Kasutajatunnus</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Parool</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Vea silt</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Tekstisilt</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>tulevikus</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>kohe</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Vähem kui minut tagasi</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Mõni aeg tagasi</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
<translation>Viga</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Tundmatu</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>allalaadimine</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>üleslaadimine</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>kustutan</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>liigutan</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>eiran</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>viga</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Helburuko fitxategiak espero ez den tamaina edo aldaketa data du</translation>
</message>
<translation>Desmarkatutako karpetak zure bertako fitxategi sistematik <b>ezabatuko</b> dira eta ez dira gehiago ordenagailu honekin sinkronizatuko</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Aplikatu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Ezeztatu</translation>
</message>
<translation><user> bezala <server>-n konektatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Ez da konturik konfiguratu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Gehitu berria</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Ezabatu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Kontua</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Hautatu zer sinkronizatu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Ezabatu karpeta honen konexioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Karpeta sortzeak huts egin du</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Ezin izan da <i>%1</i> bertako karpeta sortu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Baieztatu Karpetaren Konexioaren Ezabatzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Ezabatu Karpeta Honen Konexioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Sinkronizazioa martxan da</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>%1ra konektatuta.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>%1 zerbitzaria ez dago orain eskuragarri</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>%1etik saioa itxita.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Hasi saioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Sinkronizatuko ez diren oso handiak diren karpeta berriak daude:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Baieztatu Kontuaren Ezabatzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Ezabatu konexioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Ireki karpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Saioa bukatu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Berrekin sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Gelditu sinkronizazioa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%2tik %1 erabilita</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Zerbitzariaren Jarduera</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Sinkronizazio protokoloa</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopiatu</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiatu jarduera zerrenda arbelara.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Sinkronizatu gabekoak</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Arbelera kopiatua</translation>
</message>
<translation><br/>%1 kontuak ez ditu jarduerak gaituta.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Bertako %1 karpeta ez da existitzen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 karpeta bat izan behar zen baina ez da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ezabatua izan da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 deskargatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 kargatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 %2-(e)ra berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2-(e)ra mugitu da.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 ezin izan da sinkronizatu akats bat dela eta. Ikusi egunerkoa zehaztapen gehiago izateko.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>Ezin izan da sistemako baztertutakoen fitxategia irakurri</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Ezin izan da karpetaren egoera berrezarri</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Erabiltzaileak bertan behera utzi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Ez da karpeta egokirik hautatu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>Hautatutako bidea ez da karpeta bat!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>%1. fitxategia %2tik</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Itxoiten...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Itxoiten beste karpeta %n...</numerusform><numerusform>Itxoiten beste %n karpeta...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Sinkronizatzeko prestatzen...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Zerbitzariak eduki-hein desegokia itzuli du</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Konexioa denboraz kanpo</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Mesedez sartu %1 pasahitza:
-
-Erabiltzailea: %2
-Kontua: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Sartu Pasahitza</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Konexioa denboraz kanpo</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>%1ra konektatu</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Sartu erabiltzailearen kredentzialak</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Konexioa ongi burutu da %1 zerbitzarian: %2 bertsioa %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Denbora iraungi da %1era %2n konektatzen saiatzean.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>%2 zerbitzarian dagoen %1 konektatzen...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Bertako %1 karpeta dagoeneko existitzen da, sinkronizaziorako prestatzen.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ados</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>huts egin du.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Ezin da %1 karpeta lokala sortu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Ez da urruneko karpeta zehaztu!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Errorea: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>ownClouden karpeta sortzen: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Urruneko %1 karpeta ongi sortu da.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Urruneko %1 karpeta dagoeneko existintzen da. Bertara konetatuko da sinkronizatzeko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Karpeta sortzeak HTTP %1 errore kodea igorri du</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Huts egin du urrutiko karpeta sortzen emandako kredintzialak ez direlako zuzenak!<br/> Egin atzera eta egiaztatu zure kredentzialak.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Urruneko karpeten sortzeak huts egin du ziuraski emandako kredentzialak gaizki daudelako.</font><br/>Mesedez atzera joan eta egiaztatu zure kredentzialak.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Urruneko %1 karpetaren sortzeak huts egin du <tt>%2</tt> errorearekin.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Sinkronizazio konexio bat konfiguratu da %1 karpetatik urruneko %2 karpetara.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>%1-era ongi konektatu da!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>%1 konexioa ezin da ezarri. Mesedez egiaztatu berriz.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Karpetaren berrizendatzeak huts egin du</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Ezin da karpeta ezabatu eta kopia egin, karpeta edo barruko fitxategiren bat beste programa batean irekita dagoelako. Mesedez itxi karpeta edo fitxategia eta sakatu berrekin edo ezeztatu konfigurazioa.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Bertako sinkronizazio %1 karpeta ongi sortu da!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Konexio Morroia</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Saltatu karpeten ezarpenak</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Fitxategia zerbitzaritik ezabatua izan da</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Karpeta hau ezin da berrizendatu. Bere jatorrizko izenera berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Karpeta hau ezin da berrizendatu. Mesedez jarri berriz Shared izena.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Fitxategia Ezabatua</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Fitxategi lokala aldatu da sinkronizazioan.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Fitxategi lokala ezabatu da sinkronizazioan.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<translation>ownCloud-en bidea:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Karpeta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Kopiatu &lotura</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Baimendu editatzea</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Mesedez Ezarri Pasahitza</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Errorea sartzean</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Arrakasta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSyncek huts egin du memoria alokatzean.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync parametro larri errorea.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP transmisio errore bat gertatu da.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>Errore bat egon da karpeta bat irekitzearkoan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSyncen zehaztugabeko errorea.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Erabiltzaileak bertan behera utzita</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>Fitxategia baztertutakoen zerrendan dago.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
- <source>Filename is too long.</source>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <source>Filename is too long.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Ezin da sinkronizazio egunerokoa ireki</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Fitxategi izenak behintzat baliogabeko karaktere bat du</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Ezabatzeko baimenik gabe, berrezartzen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<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="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>helburua</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>jatorria</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>%1 Bertsioa. Informazio gehiago eskuratzeko ikusi <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Mesedez saioa hasi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Ez dago sinkronizazio karpetarik definituta.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Ez dago sinkronizazio karpetarik definituta.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Ireki nabigatzailean</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Saioa hasi...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Saioa bukatu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Azkenengo Aldaketak</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Kudeatutako karpetak:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Ireki '%1' karpeta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Ireki %1 arakatzailean</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Egoera ezezaguna</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Ezarpenak...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Xehetasunak...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Laguntza</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>%1etik Irten</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>%1etik deskonektatuta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Kontuetatik deskonektatuta:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>%1 Kontua: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Saioa bukatu kontu guztietan</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Saioa hasi kontu guztietan...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Ez da azken aldian ezer sinkronizatu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sinkronizatzen %1 %2tik (%3 faltan)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sinkronizatzen %1 (%2faltan)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Eguneratua</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TestuEtiketa</translation>
</message>
<translation>Hasi sinkronizazio &garbia (Bertako karpeta ezabatzen du!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Hautatu zer sinkronizatu</translation>
</message>
<translation>&Sinkronizatu zerbitzarian dagoen guztia</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Egoera mezua</translation>
</message>
<translation>Formularioa</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Erabiltzaile-izena</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Pasahitza</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>TestuEtiketa</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Orain dela minutu bat baino gutxiago</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Giteko <a href="%1">%2</a>. errebisiotik konpilatuta %3-an, %4etan Qt %5, %6 erabiliz</small></p></translation>
</message>
<translation>Errorea</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Ezezaguna</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>deskargatzen</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>igotzen</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>ezabatzen</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>mugitzen</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>errorea</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>فایل مقصد دارای سایز و یا تاریخ ویرایش غیرمتعارف است</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>اعمال</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>منصرف شدن</translation>
</message>
<translation>متصل به <server> به عنوان <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>هیچ حسابکاربریای تنظیم نشده است.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>حذف</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>حساب کاربری</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>انتخاب موارد همگامسازی</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>متصل به %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>سرور %1 بصورت موقت خارج از دسترس است.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>ورود</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<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="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>بازکردن پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>خروج</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>از سرگیری همگامسازی</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>توقف بههنگامسازی </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>بدون %1 اتصال پیکربندی شده.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>پروتکل همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>کپی کردن</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>کپی به کلیپ بورد</translation>
</message>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation>متوقف شده توسط کاربر</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>پوشه محلی %1 موجود نیست.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 حذف شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 بارگزاری شد.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 بروز رسانی شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 به %2 تغییر نام داده شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 به %2 انتقال داده شده است.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>فعالیت همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>حذف تمام فایل ها؟</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>حذف تمام فایل ها</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>نگه داشتن فایل ها</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation> (پشتیبان %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>آماده سازی برای همگام سازی کردن.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>خارج کردن کاربر.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (همگامسازی موقتا متوقف شده است)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>هیچ پوشهی معتبری انتخاب نشده است!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>شما اجازه نوشتن در پوشه های انتخاب شده را ندارید!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>فایل %1 از %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>درحال انتظار...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>در انتظار برای %n پوشهی دیگر ...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>آمادهسازی همگامسازی ...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>تایم اوت اتصال</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>رمز را وارد کنید</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>متصل به %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green"> با موفقیت متصل شده است به %1: %2 نسخه %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>ارتباط ناموفق با %1 در %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>تلاش برای اتصال %1 به %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>پوشه همگام سازی محلی %1 در حال حاضر موجود است، تنظیم آن برای همگام سازی. <br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>خوب</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>ناموفق.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>نمی تواند پوشه محلی ایجاد کند %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>خطا: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>ایجاد کردن پوشه بر روی ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>پوشه از راه دور %1 با موفقیت ایجاد شده است.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>در حال حاضر پوشه از راه دور %1 موجود است. برای همگام سازی به آن متصل شوید.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>ایجاد پوشه از راه دور ناموفق بود به علت اینکه اعتبارهای ارائه شده اشتباه هستند!<br/>لطفا اعتبارهای خودتان را بررسی کنید.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red"> ایجاد پوشه از راه دور ناموفق بود، شاید به علت اعتبارهایی که ارئه شده اند، اشتباه هستند.</font><br/> لطفا باز گردید و اعتبار خود را بررسی کنید.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>ایجاد پوشه از راه دور %1 ناموفق بود با خطا <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>یک اتصال همگام سازی از %1 تا %2 پوشه از راه دور راه اندازی شد.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>با موفقیت به %1 اتصال یافت!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>اتصال به %1 نمی تواند مقرر باشد. لطفا دوباره بررسی کنید.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>تغییر نام پوشه ناموفق بود</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b> پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>فایل از روی سرور حذف شد</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>فایل حذف شد</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>فایل محلی در حین همگامسازی تغییر کرده است.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>فایل محلی در حین همگامسازی حذف شده است.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<translation>مسیر ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 اشتراکگذاری</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>پوشه: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>کپی & لینک</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>اجازهی ویرایش</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>محافظت شده توسط رمزعبور</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>لطفا رمزعبور را تعیین کنید</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&اشتراکگذاری لینک</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>خطای ورود</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>موفقیت</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync هنگام پردازش درختان داخلی یک خطا دریافت نمود.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync موفق به رزرو حافظه نشد است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>مرحله به روز روسانی پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>مرحله تطبیق پردازش CSync ناموفق بود.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>عدم موفقیت CSync برای مراجعه به پروکسی یا سرور.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>عدم موفقیت CSync برای اعتبار دادن در %1 سرور.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>CSync failed to connect to the network.</source>
<translation>عدم موفقیت CSync برای اتصال به شبکه.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>خطا در انتقال HTTP اتفاق افتاده است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>یک خطا در هنگام باز کردن یک پوشه رخ داده است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>خطا در هنگام خواندن پوشه</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: فضا در %1 سرور در دسترس نیست.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>خطای نامشخص CSync </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>متوقف شده توسط کاربر</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>سرویس بصورت موقت خارج از دسترس است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>یک خطای داخلی با شماره خطای %1 رخ داده است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>نام فایل خیلی طولانی است.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>وضعیت ناموفق</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>رمزگذاری نام فایل معتبر نیست</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>کاراکتر نامعتبر، لطفا "%1" را تغییر نام دهید</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>حذف مجاز نیست، در حال بازگردادن</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>فایلهای محلی و پوشهی اشتراک حذف شد.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>انتقال مجاز نیست، مورد بازگردانده شد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>مقصد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>مبدا</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>نسخه %1. برای اطلاعات بیشتر لطفا اینجا را مشاهده کنید t <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>لطفا وارد شوید</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>پوشه %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>هیچ پوشه ای همگام سازی شدهای تنظیم نشده است</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>هیچ پوشهای برای همگامسازی تنظیم نشده است.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>باز کردن در مرورگر</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>ورود...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>خروج</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>تغییرات اخیر</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>پوشه های مدیریت شده:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>بازکردن پوشهی '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>وضعیت نامعلوم</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>تنظیمات...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>جزئیات...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>راهنما</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>خروج %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>قطعشده از %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>حسابکاربری %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>هیچ موردی به تازگی همگامسازی نشده است</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>همگامسازی %1 از%2 (%3 باقیمانده)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>همگامسازی %1 (%2 باقیمانده)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>تا تاریخ</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>برچسب متنی</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>انتخاب موارد همگامسازی</translation>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>پیغام وضعیت</translation>
</message>
<translation>فرم</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&نامکاربری</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&رمزعبور</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>برچسب خطا</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>برچسب متنی</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
<translation>خطا</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>نامشخص</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>در حال دانلود</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>در حال آپلود</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>در حال حذف</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>در حال انتقال</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>نادیده گرفتن</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>خطا</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Kohdetiedostolla on odottamaton koko tai muokkausaika</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Toteuta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<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="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Tiliä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Lisää uusi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Poista</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Tili</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Valitse synkronoitavat tiedot</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Poista kansion synkronointiyhteys</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Kansion luominen epäonnistui</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Vahvista kansion synkronointiyhteyden poisto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Poista kansion synkronointiyhteys</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Synkronointi meneillään</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 käytössä</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<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="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Palvelimen versio %1 on vanha ja sen tuki on loppunut! Jatka omalla vastuulla.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Yhteys muodostettu kohteeseen %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<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="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Kirjauduttu ulos kohteesta %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Kirjaudu sisään</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Havaittiin uusia kansioita, joita ei synkronoitu niiden suuren koon vuoksi:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Vahvista tilin poistaminen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Poista yhteys</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Avaa kansio</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Kirjaudu ulos</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Palauta synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Keskeytä synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1/%2 käytössä</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Palvelimen toimet</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Synkronointiprotokolla</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Luettelo ohitettavista tai virheellisistä tiedostoista</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopioi</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopioi toimilista leikepöydälle.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Ei synkronoitu</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Ei synkronoitu (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Kopioitu leikepöydälle</translation>
</message>
<translation><br/>Tilillä %1 ei ole toimia käytössä.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Paikallista kansiota %1 ei ole olemassa.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on poistettu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on ladattu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on päivitetty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on nimetty uudeelleen muotoon %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Kohdetta %1 ei voi synkronoida virheen vuoksi. Katso tarkemmat tiedot lokista.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Varmuuskopio poistettu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Normaali synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Kansion tilaa ei voitu alustaa</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation> (varmuuskopio)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation> (varmuuskopio %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Odotetaan synkronoinnin aloitusta.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Kelvollista kansiota ei ole valittu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Paikallinen kansio %1 on jo käytössä kansion synkronointiyhteydessä. Valitse toinen kansio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Paikallinen kansio %1 sisältää kansion, jota käytetään kansion synkronointiyhteydessä. Valitse toinen kansio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>tiedosto %1/%2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Odotetaan...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Odotetaan %n muuta kansiota...</numerusform><numerusform>Odotetaan %n muuta kansiota...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Valmistaudutaan synkronointiin...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Anna %1-salasana:
-
-Käyttäjä: %2
-Tili: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Anna salasana</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Yhteys aikakatkaistiin</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&Sähköpostiosoite</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Muodosta yhteys - %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Anna käyttäjätiedot</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Muodostettu yhteys onnistuneesti kohteeseen %1: %2 versio %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Yhteys %1iin osoitteessa %2 epäonnistui:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Aikakatkaisu yrittäessä yhteyttä kohteeseen %1 osoitteessa %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Yritetään yhdistetää palvelimeen %1 portissa %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Todennettuun webdav-pyyntöön saatiin virheellinen vastaus</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Palvelin esti käyttämisen. Vahvista käyttöoikeutesi palvelimeen <a href="%1">napsauttamalla tästä</a> ja kirjaudu palveluun selaimella.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Paikallinen kansio %1 on jo olemassa, asetetaan se synkronoitavaksi.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Luodaan paikallista synkronointikansiota %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>epäonnistui.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Paikalliskansion %1 luonti epäonnistui</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Etäkansiota ei määritelty!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Virhe: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>luodaan kansio ownCloudiin: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Etäkansio %1 luotiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Etäkansio %1 on jo olemassa. Otetaan siihen yhteyttä tiedostojen täsmäystä varten.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Kansion luonti aiheutti HTTP-virhekoodin %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Etäkansion luominen epäonnistui koska antamasi tunnus/salasana ei täsmää!<br/>Ole hyvä ja palaa tarkistamaan tunnus/salasana</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Pilvipalvelun etäkansion luominen ei onnistunut , koska tunnistautumistietosi ovat todennäköisesti väärin.</font><br/>Palaa takaisin ja tarkista käyttäjätunnus ja salasana.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Etäkansion %1 luonti epäonnistui, virhe <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Täsmäysyhteys kansiosta %1 etäkansioon %2 on asetettu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Yhteys kohteeseen %1 muodostettiin onnistuneesti!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Yhteyttä osoitteeseen %1 ei voitu muodostaa. Ole hyvä ja tarkista uudelleen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Kansion nimen muuttaminen epäonnistui</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Paikallinen synkronointikansio %1 luotu onnistuneesti!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1-yhteysavustaja</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Ohita kansioiden määritykset</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Lataaminen laskisi vapaan levytilan määrän alle rajan %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Levyllä on vapaata tilaa vähemmän kuin %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Tiedosto poistettiin palvelimelta</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Tiedostoa ei voitu ladata täysin.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Tiedosto on muuttunut löytymisen jälkeen</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tätä kansiota ei ole tule nimetä uudelleen. Muutetaan takaisin alkuperäinen nimi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Tiedosto nimettiin uudelleen, mutta se on osa "vain luku"-jakoa. Alkuperäinen tiedosto palautettiin.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>HTTP-palvelin palautti väärän koodin. Odotettiin koodia 201, vastaanotettiin "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Tiedosto poistettu</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Paikallinen tiedosto muuttui synkronoinnin aikana.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Paikallinen tiedosto poistettiin synkronoinnin aikana.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Virhe kirjoittaessa metadataa tietokantaan</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>ownCloud-polku:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 - Jakaminen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Kansio: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Palvelin ei salli jakamista</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Kopioi &linkki</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Salli muokkaus</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>&Suojaa salasanalla</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Salasanasuojattu</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>&Julkinen jakaminen vaatii salasanan</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Aseta salasana</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Jaa linkki</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Kirjautumisvirhe</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Onnistui.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync ei onnistunut varaamaan muistia.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>Tapahtui verkon aikakatkaisu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>Tapahtui HTTP-välitysvirhe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>Kansiota avatessa tapahtui virhe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Kansiota lukiessa tapahtui virhe</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Vain %1 on käytettävissä, käynnistymiseen tarvitaan %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync - määrittämätön virhe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Keskeytetty käyttäjän toimesta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<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="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Pääsy estetty</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>Sisäinen virhe, numero %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>Tiedosto on ohituslistalla.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Tiedoston nimi on liian pitkä.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Stat epäonnistui.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Tiedostonimen merkistökoodaus ei ole kelvollista</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Tiedoston nimi sisältää ainakin yhden virheellisen merkin</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Ei sallittu, koska oikeutesi eivät riitä alikansioiden lisäämiseen kyseiseen kansioon</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Poistaminen ei ole sallittua, palautetaan</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>Paikalliset tiedostot ja jakokansio poistettu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<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="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>kohde</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>lähde</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versio %1. Lisätietoja osoitteessa <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Kirjaudu sisään</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Kansio %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Synkronointikansioita ei ole määritetty.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Synkronointikansioita ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Avaa selaimessa</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Kirjaudu sisään...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Kirjaudu ulos</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Viimeisimmät muutokset</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Hallitut kansiot:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Avaa kansio '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Avaa %1 selaimeen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Tuntematon tila</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Asetukset...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Tiedot...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Ohje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Lopeta %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Katkaise yhteys kohteeseen %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Palvelimen versio ei ole tuettu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Katkaistu yhteys tileihin:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Tili %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Tilin synkronointi on poistettu käytöstä</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Keskeytä kaikki kansiot</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Palauta kaikki synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Palauta synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Keskeytä kaikki synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Keskeytä synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Kirjaudu ulos kaikista tileistä</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Kirjaudu kaikille tileille...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Kohteita ei ole synkronoitu äskettäin</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synkronoidaan %1/%2 (%3 jäljellä)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synkronoidaan %1 (%2 jäljellä)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Ajan tasalla</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TekstiLeima</translation>
</message>
<translation>Aloita &puhdas synkronointi (poistaa paikallisen kansion!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Valitse synkronoitavat tiedot</translation>
</message>
<translation>S&ynkronoi kaikki palvelimelta</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Tilaviesti</translation>
</message>
<translation>Lomake</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Käyttäjätunnus</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Salasana</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>TekstiLeima</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>tulevaisuudessa</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n päivä sitten</numerusform><numerusform>%n päivää sitten</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n tunti sitten</numerusform><numerusform>%n tuntia sitten</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>nyt</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Alle minuutti sitten</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minuutti sitten</numerusform><numerusform>%n minuuttia sitten</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Jokin aika sitten</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 Gt</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 Mt</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 kt</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 t</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n vuosi</numerusform><numerusform>%n vuotta</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n kuukausi</numerusform><numerusform>%n kuukautta</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n päivä</numerusform><numerusform>%n päivää</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n tunti</numerusform><numerusform>%n tuntia</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuutti</numerusform><numerusform>%n minuuttia</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekunti</numerusform><numerusform>%n sekuntia</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Koostettu Git-revisiosta <a href="%1">%2</a> %3, %4 käyttäen Qt:n versiota %5, %6</small></p></translation>
</message>
<translation>Virhe</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Tuntematon</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>ladataan</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>lähetetään</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>poistetaan</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>siirretään</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>virhe</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Le fichier de destination a une erreur de taille ou de date de modification</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Appliquer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
<translation>Connecté à <server> en tant que <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Aucun compte configuré.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Ajouter un nouveau</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Supprimer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Choisir le contenu à synchroniser</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Supprimer la synchronisation du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Échec de création du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmer une suppression de synchronisation de dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Supprimer la synchronisation de ce dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Synchronisation en cours</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 utilisés</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<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="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>La version %1 du serveur est ancienne et n'est pas prise en charge. Continuez à vos risques et périls.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Connecté à %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Le serveur %1 est temporairement indisponible.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Session sur %1 fermée.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Se connecter</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Certains dossiers n'ont pas été synchronisés en raison de leur taille trop importante :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Confirmer la suppression du compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Supprimer la connexion</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Ouvrir le dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Se déconnecter</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Reprendre</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Mettre en pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 sur %2 utilisés</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Activité du serveur</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protocole de synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Liste des fichiers ignorés ou en erreur</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copier la liste d'activités dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Fichiers non synchronisés</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Non Synchronisé (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>La liste des activités du serveur a été copiée dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>La liste des activités de synchronisation a été copiée dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>La liste des éléments non synchronisés a été copiée dans le presse-papier.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Copié dans le presse-papier</translation>
</message>
<translation><br/>Le compte %1 n'a aucune activité activée.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Vous avez reçu %n nouvelle notification de %2.</numerusform><numerusform>Vous avez reçu %n nouvelles notifications de %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Vous avez reçu 1 nouvelle notification de %1 et %2.</numerusform><numerusform>Vous avez reçu %n nouvelles notifications de %1 et %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Vous avez reçu de nouvelles notifications de %1, %2 et d'autres comptes.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Notifications - Action Requise</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Erreur à l'écriture des métadonnées dans la base de données</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Le dossier local %1 n'existe pas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 devrait être un dossier mais ne l'est pas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été supprimé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été téléchargé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été mis à jour.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 a été renommé en %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a été déplacé vers %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 a été supprimé.</numerusform><numerusform>%1 et %n autres fichiers ont été supprimés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 a été téléchargé.</numerusform><numerusform>%1 et %n autres fichiers ont été téléchargés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 a été mis à jour.</numerusform><numerusform>%1 et %n autres fichiers ont été mis à jour.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 a été renommé en %2.</numerusform><numerusform>%1 a été renommé en %2 et %n autres fichiers ont été renommés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 a été déplacé vers %2.</numerusform><numerusform>%1 a été déplacé vers %2 et %n autres fichiers ont été déplacés.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 a un conflit de synchronisation.</numerusform><numerusform>%1 et %n autres fichiers ont des problèmes de synchronisation.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 a un problème de synchronisation. Merci de vérifier le fichier conflit !</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 ne peut pas être synchronisé en raison d'erreurs. Consultez les logs pour les détails.</numerusform><numerusform>%1 et %n autres fichiers n'ont pas pu être synchronisés en raison d'erreurs. Consultez les logs pour les détails.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 n'a pu être synchronisé pour cause d'erreur. Consultez les logs pour les détails.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Cette synchronisation remettra une version précédente des fichiers dans le dossier de synchronisation '%1'.
-Cela peut être dû à une copie de sauvegarde restaurée sur le serveur.
-Continuer la synchronisation comme d'habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d'un état précédent. Voulez-vous garder les versions les plus récentes de vos fichiers en tant que fichiers conflictuels ?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Sauvegarde détecté</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Synchronisation normale</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Garder les fichiers locaux comme Conflits</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<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="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(sauvegarde)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(sauvegarde %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<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="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Erreur d'installation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Abandon par l'utilisateur.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Aucun dossier valable sélectionné !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 restant, %1 sur %2, fichier %3 sur %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>fichier %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>En attente ...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Préparation à la synchronisation</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<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/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Délai d'attente de connexion dépassé</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Veuillez entrer le mot de passe %1 :
-
-Utilisateur : %2
-Compte : %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>Erreur lors de l'accès au trousseau : '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Saisissez le mot de passe</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Délai de connexion dépassé</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&Adresse mail</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Connexion à %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Saisissez les identifiants de connexion de l'utilisateur</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Connecté avec succès à %1 : %2 version %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Échec de la connexion à %1 sur %2 :<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Délai d'attente dépassé lors de la connexion à %1 sur %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentative de connexion à %1 sur %2 ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>La requête d'authentification vers le serveur a été redirigée vers '%1'. L'URL est erronée, le serveur est mal configuré.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Une réponse non valide a été reçue suite à une requête WebDav authentifiée.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Accès refusé par le serveur. Pour vérifier que vous avez accès, <a href="%1">cliquez ici</a> pour accéder au service avec votre navigateur.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Le dossier de synchronisation local %1 existe déjà, configuration de la synchronisation.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Création du dossier local de synchronisation %1... </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>échoué.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Impossible de créer le répertoire local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Aucun dossier distant spécifié !</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Erreur : %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>création d'un répertoire sur ownCloud : %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Le dossier distant %1 a été créé avec succès.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Le dossier distant %1 existe déjà. Connexion.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La création du dossier a généré le code d'erreur HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>La création du répertoire distant a échoué car les informations d'identification sont erronées !<br/>Veuillez revenir en arrière et les vérifier.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">La création du dossier distant a échoué, probablement parce que les informations d'identification fournies sont fausses.</font><br/>Veuillez revenir en arrière et les vérifier.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>La création du dossier distant "%1" a échouée avec l'erreur <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Une synchronisation entre le dossier local %1 et le dossier distant %2 a été configurée.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Connecté avec succès à %1 !</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>La connexion à %1 n'a pu être établie. Veuillez réessayer.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Echec du renommage du dossier</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Impossible de supprimer et de sauvegarder le dossier parce que ce dossier ou un de ses fichiers est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et ré-essayer, ou annuler l'installation.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Dossier de synchronisation local %1 créé avec succès !</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>Assistant de Connexion %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Passer outre la configuration des dossiers</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Erreur à l'écriture des métadonnées dans la base de données</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Le téléchargement réduirait l'espace libre à moins de %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Il y a moins de %1 d'espace libre sur le disque</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Le fichier a été supprimé du serveur</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Le fichier n'a pas pu être téléchargé intégralement.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>Le fichier téléchargé est vide malgré que le serveur a annoncé qu'il aurait dû être %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Le fichier a changé depuis sa découverte</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Erreur à l'écriture des métadonnées dans la base de données</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Le fichier %1 ne peut pas être renommé en %2 à cause d'un conflit local de nom de fichier</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Erreur à l'écriture des métadonnées dans la base de données</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Ce dossier ne doit pas être renommé. Il sera renommé avec son nom original.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Le nom de ce dossier ne doit pas être changé. Veuillez le renommer en Shared.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Le fichier a été renommé mais appartient à un partage en lecture seule. Le fichier original a été restauré.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Le code HTTP retourné par le serveur n'est pas valide. La valeur attendue est 201 mais la valeur reçue est "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Erreur à l'écriture des métadonnées dans la base de données</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Fichier supprimé</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Fichier local modifié pendant la synchronisation. Elle va reprendre. </translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Fichier local modifié pendant la synchronisation.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>URL de sondage manquante</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Fichier local supprimé pendant la synchronisation.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Le serveur n'a pas confirmé la réception du dernier morceau. (Aucun e-tag n'était présent).</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Erreur à l'écriture des métadonnées dans la base de données</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Chemin ownCloud :</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>Partage %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Dossier: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Le serveur ne prend pas en charge le partage</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Récupération des permissions de partage maximales possibles depuis le serveur...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Copier le &lien</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Permettre la modification</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Protéger par mot de p&asse</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Protégé par mot de passe</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<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/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Veuillez choisir un mot de passe</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>Partager par &lien public</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Erreur de connexion</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Succès.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Erreur fatale CSync : mauvais paramètre.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<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="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Erreur lors de la lecture du dossier.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Le fichier/dossier est ignoré car il est caché.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Seulement %1 disponibles, il faut au moins %2 pour démarrer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Erreur CSync inconnue.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Interrompu par l'utilisateur</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync n'a pas pu accéder à</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync a échoué en raison d'un refus de permission non pris en charge.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<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="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Le service est temporairement indisponible.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>L'accès est interdit</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Le nom de fichier est trop long.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Stat échoué.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<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="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Impossible de lire la liste noire de la base de données locale</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Impossible de lire le journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<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="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Le nom de fichier contient au moins un caractère non valable</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Non autorisé à supprimer. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<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="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>la destination</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>la source</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Version %1. Pour plus d'information, visitez <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud, Inc.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribué par %1 et sous licence GNU General Public License (GPL) Version 2.0.<br/>%2 et le logo %2 sont des marques enregistrées de %1 aux Etats-Unis, dans d'autres pays, ou les deux.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Veuillez vous connecter</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Dossier %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Aucun répertoire synchronisé n'est configuré.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Aucun répertoire à synchroniser n'est configuré.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Ouvrir dans le navigateur</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Connexion...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Se déconnecter</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Modifications récentes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Recherche de modifications dans '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Répertoires configurés :</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Ouvrir le dossier '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Ouvrir %1 dans le navigateur</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Statut inconnu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Paramètres...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Détails...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Quitter %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Déconnecté de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Version du Serveur non prise en charge</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Le serveur sur le compte %1 fonctionne avec une version ancienne et non-supportée %2. Utiliser ce client avec des versions non-supportées du serveur n'est pas testé et est potentiellement dangereux. Procédez à vos risques et périls.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Déconnecté des comptes :</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Compte %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>La synchronisation du compte est désactiver .</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Relance tous les dossiers </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Mettre en pause tous les dossiers</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>relancer toutes les synchronisations</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>relancer la synchronisation </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Mettre en pause tout la synchronisation </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Mettre en pause la synchronisation </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Se déconnecter de tous les comptes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Se connecter à tous les comptes...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Plantage maintenant</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Aucun élément synchronisé récemment</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronisation de %1 sur %2 (%3 restant)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronisation de %1 (%2 restant)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
- <translation><p>Version %2. Pour plus d'informations, consultez <a href="%3">%4</a></p><p><small>Par Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz et autres.</small></p><p>Copyright ownCloud GmbH</p><p>Sous licence GNU General Public License (GPL) Version 2.0<br/>ownCloud et le logo ownCloud sont des marques déposées de ownCloud, Inc. aux Etats-Unis, dans d'autres pays, ou dans les deux.</p></translation>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Réinitialiser la syn&chronisation (Supprime le dossier local !)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Choisir le contenu à synchroniser</translation>
</message>
<translation>S&ynchroniser tout le contenu depuis le serveur</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Message d'état</translation>
</message>
<translation>Formulaire</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Nom d'utilisateur</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Mot de passe</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Message d'erreur</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Zone de texte</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>Dans le futur</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>Hier</numerusform><numerusform>Il y a %n jours</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>Il y a %n heure</numerusform><numerusform>Il y a %n heures</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>maintenant</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Il y a moins d'une minute</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>Il y a %n minute</numerusform><numerusform>Il y a %n minutes</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Il y a quelque temps</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 Go</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 Mo</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 Ko</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 octets</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n an</numerusform><numerusform>%n ans</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n mois</numerusform><numerusform>%n mois</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n jour</numerusform><numerusform>%n jours</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n heure</numerusform><numerusform>%n heures</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minute</numerusform><numerusform>%n minutes</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n seconde</numerusform><numerusform>%n secondes</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construit à partir de la révision Git <a href="%1">%2</a> du %3, %4 en utilisant Qt %5, %6.</small><p></translation>
</message>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Inconnu</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>téléchargement de</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>téléversement</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>suppression</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>déplacement</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>Ignore</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>erreur</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>O ficheiro de destino ten un tamaño ou unha hora de modificación non agardados</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Conectado con <server> como <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Non hai contas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Retirar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Escolla que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Non foi posíbel crear o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Sincronización en proceso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 como <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<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="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Desconectado de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Acceder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<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="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Abrir o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Desconectar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Continuar coa sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Por en pausa a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protocolo de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista da actividade no portapapeis.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Copiado no portapapeis.</translation>
</message>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>O cartafol local %1 non existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 non puido sincronizarse por mor dun erro. Vexa os detalles no rexistro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<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="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(copia de seguranza)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(copia de seguranza %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Non seleccionou ningún cartafol correcto!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>ficheiro %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>O servidor devolveu un intervalo de contidos estragado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Escriba o contrasinal %1:
-
-Usuario: %2
-Conta: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<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"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Escriba o contrasinal</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Esgotouse o tempo de conexión</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Conectar con %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Escriba as credenciais do usuario</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Conectouse correctamente a %1: %2 versión %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Non foi posíbel conectar con %1 en %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Esgotouse o tempo tentando conectarse a %1 en %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentando conectarse a %1 en %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>A solicitude autenticada no servidor foi redirixida a «%1», O URL é incorrecto, o servidor está mal configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Deuse unha resposta incorrecta a unha solicitude de WebDAV autenticada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Acceso prohibido polo servidor. Para comprobar que dispón do acceso axeitado, <a href="%1">prema aquí</a> para acceder ao servizo co seu navegador.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>O cartafol de sincronización local %1 xa existe. Configurándoo para a sincronización.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Creando un cartafol local de sincronización %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>aceptar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>fallou.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Non foi posíbel crear o cartafol local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Non foi especificado o cartafol remoto!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>creando o cartafol en ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>O cartafol remoto %1 creouse correctamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>O cartafol remoto %1 xa existe. Conectándoo para a sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A creación do cartafol resultou nun código de erro HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>A creación do cartafol remoto fracasou por por de seren incorrectas as credenciais!<br/>Volva atrás e comprobe as súas credenciais.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">A creación do cartafol remoto fallou probabelmente debido a que as credenciais que se deron non foran as correctas.</font><br/>Volva atrás e comprobe as súas credenciais.</p> </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Produciuse un fallo ao crear o cartafol remoto %1 e dou o erro <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Estabeleceuse a conexión de sincronización de %1 ao directorio remoto %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Conectou satisfactoriamente con %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Non foi posíbel estabelecer a conexión con %1. Compróbeo de novo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Non foi posíbel renomear o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Non é posíbel retirar e facer unha copia de seguranza do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e ténteo de novo, ou cancele a acción.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>O cartafol local de sincronización %1 creouse correctamente!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>Asistente de conexión %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Omitir a configuración dos cartafoles</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>O ficheiro vai seren eliminado do servidor</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Non foi posíbel descargar completamente o ficheiro.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>O ficheiro cambiou após seren atopado</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<translation>Non é posíbel renomear o ficheiro %1 como %2 por mor dunha colisión co nome dun ficheiro local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Non é posíbel renomear este cartafol. Non se lle cambiou o nome, mantense o orixinal.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Non é posíbel renomear este cartafol. Devólvalle o nome ao compartido.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mais é parte dunha compartición de só lectura. O ficheiro orixinal foi restaurado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>O servidor devolveu código HTTP incorrecto. Agardábase 201, mais recibiuse «%1 %2».</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Ficheiro retirado</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>O ficheiro local cambiou durante a sincronización. Retomase.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>O ficheiro local cambiou durante a sincronización.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Non se atopa o URL requirido</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>O ficheiro local retirarase durante a sincronización.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<translation>Ruta ao ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>Compartindo %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Cartafol: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Copiar a &ligazón</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Permitir a edición</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Contr&asinal de protección</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Protexido con contrasinal</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<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/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Estabeleza o contrasinal</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Ligazón para compartir</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Erro de acceso</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Correcto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<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="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Produciuse un erro non especificado de CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Interrompido polo usuario</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<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="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>O servizo está temporalmente inaccesíbel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<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="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Fallou a obtención de estatísticas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<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="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<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="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro contén algún carácter incorrecto</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Nos está permitido movelo, elemento restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>a orixe</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versión %1. Para obter máis información visite <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuído por %1 e licenciado baixo a Licenza Pública Xeral (GPL) GNU Versión 2.0.<br/>Os logotipos %2 e %2 son marcas rexistradas de %1 nos Estados Unidos de Norte América e/ou outros países.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Ten que rexistrarse</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Cartafol %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Non se configuraron cartafoles de sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Non existen cartafoles de sincronización configurados.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Desconectar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Cambios recentes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Cartafoles xestionados:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Abrir o cartafol «%1»</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 nun navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Estado descoñecido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Axustes...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Axuda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Saír de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado das contas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Quebrou agora</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Non hai elementos sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizando %1 of %2 (restan %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (restan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Etiqueta de texto</translation>
</message>
<translation>Iniciar unha sincronización &limpa (Borra o cartafol local!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Escolla que sincronizar</translation>
</message>
<translation>Sincronizar &todo o contido do servidor</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Mensaxe de estado</translation>
</message>
<translation>Formulario</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>Nome do &usuario</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Contrasinal</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Etiqueta de erro</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Etiqueta de texto</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construído a partir de la revisión Git <a href="%1">%2</a> en %3, %4 usando Qt %5, %6</small></p></translation>
</message>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Descoñecido</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>descargando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>enviando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>eliminando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>movendo</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>erro</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>A cél fájl váratlan méretű vagy módosítási dátumú</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Alkalmaz</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<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="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Nincs beállított kapcsolat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Új hozzáadása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Eltávolítás</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Fiók</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Szinkronizálandó elemek kiválasztása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Könyvtár szinkronizációs kapcsolat törlése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<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="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Könyvtár szinkronizációs kapcsolat törlésének megerősítése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Könyvtár szinkronizációs kapcsolat törlése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Szinkronizálás fut</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 használatban</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1, mint <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>%1 szerver verzió régi és már nem támogatott! Folytatás saját felelősségre.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Csatlakozva: %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>%1 szerver jelenleg nem elérhető.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Kijelentkezve innen: %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Bejelentkezés</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Néhány új könyvtár nem került szinkronizálása, mert azok túl nagyok:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<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="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Tényleg törölni szeretné a kapcsolatot <i>%1</i> fiókkal?</p><p><b>Megjegyzés:</b> Ez <b>nem</b> töröl fájlokat.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Kapcsolat törlése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Könyvtár megnyitása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Kilépés</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Szinkronizálás folytatása</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Szinkronizálás szüneteltetése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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é á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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 / %2 használatban</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Nincs beállított kapcsolat: %1.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Szerver aktivitás</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Szinkronizációs protokoll</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Kihagyott vagy hibás fájlok listázása</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Másolás</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Az aktivitási lista másolása a vágólapra.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Nincs szinkronizálva</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Nincs szinkronizálva (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>A szerver aktivitási lista a vágólapra másolva.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>A szinkronizációs aktivitási lista a vágólapra másolva.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>A nem szinkronizált elemek a vágólapra másolva.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Másolva a vágólapra</translation>
</message>
<translation><br /> %1 fióknak nincsenek engedélyezve az aktivitások.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>%n új értesítést kapott innen: %2.</numerusform><numerusform>%n új értesítést kapott innen: %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>%n új értesítést kapott innen: %1 és %2.</numerusform><numerusform>%n új értesítést kapott innen: %1 és %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Új értesítést kapott innen: %1, %2 és további fiókoktól.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 értesítések - Beavatkozás szükséges</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 helyi mappa nem létezik.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 valószínűleg könyvtár, de nem az.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen törölve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen letöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen feltöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 átnevezve erre: %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 áthelyezve ide: %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 és %n további fájl törölve.</numerusform><numerusform>%1 és %n további fájl törölve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 és %n további fájl letöltve.</numerusform><numerusform>%1 és %n további fájl letöltve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 és %n további fájl feltöltve.</numerusform><numerusform>%1 és %n további fájl feltöltve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 fájl szinkronizálási konfliktussal rendelkezik. Kérjük ellenőrizze a konfliktus fájlt!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Szinkronizálási aktivitás</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Törli az összes fájlt?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Biztonsági mentés észlelve</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Normal szinkronizáció</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Helyi file-ok megtartása konfliktusként</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(biztonsági mentés)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(biztonsági mentés: %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Várakozás a szinkronizálás elindítására.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Felhasználó megszakította.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (szinkronizálás megállítva)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<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="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nincs joga a kiválasztott könyvtár írásához!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 maradt, %1 / %2, %3 / %4 fájl</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>%1 / %2 fájl</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Várakozás...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Felkészülés szinkronizálásra...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Kapcsolat időtúllépés</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Kérjük, add meg %1 jelszót:
-
-Felhasználó: %2
-Fiók: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Jelszómegadás</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>A kapcsolat időtúllépés miatt megszakadt</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Csatlakozás: %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Azonosítási adatok megadása</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Sikeresen csatlakozott az %1-hoz: %2 verziószám %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Próbál kapcsolódni az %1-hoz: %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>A helyi %1 mappa már létezik, állítsa be a szinkronizálódását.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation> sikertelen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Hiba: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>%1 távoli nappa sikeresen létrehozva.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>A %1 távoli mappa már létezik. Csatlakoztassa a szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A könyvtár létrehozásakor keletkezett HTTP hibakód %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">A távoli mappa létrehozása sikertelen, valószínűleg mivel hibásak a megdott hitelesítési adatok.</font><br/>Lépjen vissza és ellenőrizze a belépési adatokat.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>A távoli %1 mappa létrehozása nem sikerült. Hibaüzenet: <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>A szinkronizációs kapcsolat a %1 és a %2 távoli mappa között létrejött.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Sikeresen csatlakozva: %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>A kapcsolat a %1 kiszolgálóhoz sikertelen. Ellenőrizze újra.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>A mappa átnevezése nem sikerült</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Helyi %1 szinkronizációs mappa sikeresen létrehozva!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 kapcsolódási varázsló</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>A fájl törlésre került a szerverről</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Fájl törölve</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<translation>ownCloud útvonala:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 megosztás</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Könyvtár: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>&Hivatkozás másolása</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Szerkesztés engedélyezése</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>J&elszóval védve</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Jelszóval védett</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<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/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Kérjük, állíts be egy jelszót</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>Hivatkozás &megosztása</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Bejelentkezési hiba</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Sikerült.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>Hiba a CSync memórifoglalásakor.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync hibás paraméterhiba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP átviteli hiba történt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync ismeretlen hiba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Felhasználó megszakította</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<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="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Fájlnév túl nagy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>A fájlnév legalább egy érvénytelen karaktert tartalmaz!</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>a cél</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>a forrás</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation>%1 verzió elérhető. <p>További információk: <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Belépés szükséges</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Mappa %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Nincsenek megadva szinkronizálandó mappák.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Nincsenek megadva szinkronizálandó mappák.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Megnyitás böngészőben</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Bejelentkezés...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Kilépés</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Legutóbbi változások</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Kezelt mappák:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>„%1” könyvtár megnyitása</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>%1 megnyitása böngészőben</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Ismeretlen állapot</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Beállítások...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Részletek...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Súgó</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>%1 kilépés</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Szétcsatlakozva innen: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Szétcsatlakozva a fiókokból: ó</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>%1 fiók: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Mostanában nincs szinkronizált elem</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>%1/%2 szinkronizálása (%3 maradt)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>%1 szinkronizálása (%2 maradt)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Naprakész</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>&Tiszta szinkronizálás elindítása (Mindent töröl a helyi könyvtárból!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Szinkronizálandó elemek kiválasztása</translation>
</message>
<translation>M&inden szinkronizálása a szerverről</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Állapotüzenet</translation>
</message>
<translation>Űrlap</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Felhasználónév</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Jelszó</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Hiba címke</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>TextLabel</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation type="unfinished"/>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Fordítva a <a href="%1">%2</a> Git revizíóból, %3, %4 Qt %5, %6 felhasználásával</small></p></translation>
</message>
<translation>Hiba</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Ismeretlen</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>letöltés</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>feltöltés</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>törlés</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>áthelyezés</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>kihagyás</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>hiba</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Il file di destinazione ha una dimensione o un'ora di modifica inattesa</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Applica</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
<translation>Connesso a <server> come <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Nessun account configurato.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Aggiungi nuovo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Rimuovi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Scegli cosa sincronizzare</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Rimuovi connessione di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Creazione della cartella non riuscita</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Conferma rimozione connessione di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Rimuovi connessione di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>La sincronizzazione è in corso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 in uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 come <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>La versione %1 del server è datata e non supportata! Continua a tuo rischio.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Connesso a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Il server %1 è temporaneamente non disponibile.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Disconnesso da %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Accedi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Conferma rimozione account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Rimuovi connessione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Apri cartella</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Riprendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Sospendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1% di %2 in uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Attività del server</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protocollo di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Elenco dei file ignorati o errati</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia l'elenco delle attività negli appunti.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Non sincronizzata</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Non sincronizzata (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>L'elenco di attività del server è stato copiato negli appunti.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>L'elenco di attività di sincronizzazione è stato copiato negli appunti.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>L'elenco di elementi non sincronizzati è stato copiato negli appunti.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Copiato negli appunti</translation>
</message>
<translation><br/>L'account %1 non ha attività abilitate.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Hai ricevuto %n nuova notifica da %2.</numerusform><numerusform>Hai ricevuto %n nuove notifiche da %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Hai ricevuto %n nuova notifica da %1 e %2.</numerusform><numerusform>Hai ricevuto %n nuove notifiche da %1 e %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Hai ricevuto nuove notifiche da %1, %2 e altri account.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 notifiche - azione richiesta</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>La cartella locale %1 non esiste.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 dovrebbe essere una cartella, ma non lo è.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato rimosso.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato scaricato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato aggiornato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 è stato rinominato in %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 e %n altro file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n altro file sono stati scaricati.</numerusform><numerusform>%1 e %n altri file sono stati scaricati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n altro file sono stati aggiornati.</numerusform><numerusform>%1 e %n altri file sono stati aggiornati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 è stato rinominato in %2 e %n altro file sono stati rinominati.</numerusform><numerusform>%1 è stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 è stato spostato in %2 e %n altro file sono stati spostati.</numerusform><numerusform>%1 è stato spostato in %2 e %n altri file sono stati spostati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 e %n altro file hanno conflitti di sincronizzazione.</numerusform><numerusform>%1 e %n altri file hanno conflitti di sincronizzazione.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 ha un conflitto di sincronizzazione. Controlla il file in conflitto!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>1% e %n altro file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform><numerusform>1% e %n altri file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 non può essere sincronizzato a causa di un errore. Controlla il log per i dettagli.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Questa sincronizzazione potrebbe ripristinare i file a una data precedente nella cartella di sincronizzazione '%1'.
-Ciò potrebbe verificarsi in seguito al ripristino di un backup sul server.
-Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tutti i tuoi file con file più datati in uno stato precedente. Vuoi mantenere i tuoi file locali più recenti come file di conflitto?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Backup rilevato</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Sincronizzazione normale</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantieni i file locali come conflitto</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Impossibile ripristinare lo stato della cartella</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(copia di sicurezza)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(copia di sicurezza %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>In attesa di iniziare la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>L'ultima sincronizzazione è stata completata correttamente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Interrotto dall'utente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Nessuna cartella valida selezionata!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 rimanenti, %1 di %2, file %3 di %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>file %1 di %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Attendere...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Preparazione della sincronizzazione...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Il server ha restituito un content-range errato</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Connessione scaduta</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Digita la password di %1:
-
-Utente: '%2
-Account: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<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"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Digita password</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Connessione scaduta</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>Posta &elettronica</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Connetti a %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Digita le credenziali dell'utente</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Connesso correttamente a %1: %2 versione %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Connessione a %1 su %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Tempo scaduto durante il tentativo di connessione a %1 su %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentativo di connessione a %1 su %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>La richiesta autenticata al server è stata rediretta a '%1'. L'URL è errato, il server non è configurato correttamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Ricevuta una risposta non valida a una richiesta webdav autenticata.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Accesso negato dal server. Per verificare di avere i permessi appropriati, <a href="%1">fai clic qui</a> per accedere al servizio con il tuo browser.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>La cartella di sincronizzazione locale %1 esiste già, impostata per la sincronizzazione.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Creazione della cartella locale di sincronizzazione %1... </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>non riuscita.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Impossibile creare la cartella locale %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Nessuna cartella remota specificata!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Errore: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>creazione cartella su ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>La cartella remota %1 è stata creata correttamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>La cartella remota %1 esiste già. Connessione in corso per la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La creazione della cartella ha restituito un codice di errore HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>La creazione della cartella remota non è riuscita poiché le credenziali fornite sono errate!<br/>Torna indietro e verifica le credenziali.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">La creazione della cartella remota non è riuscita probabilmente perché le credenziali fornite non sono corrette.</font><br/>Torna indietro e controlla le credenziali inserite.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Creazione della cartella remota %1 non riuscita con errore <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Una connessione di sincronizzazione da %1 alla cartella remota %2 è stata stabilita.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Connesso con successo a %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>La connessione a %1 non può essere stabilita. Prova ancora.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Rinomina della cartella non riuscita</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperta in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Cartella locale %1 creata correttamente!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>Procedura guidata di connessione di %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Salta la configurazione delle cartelle</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Lo scaricamento ridurrà lo spazio libero su disco al di sotto di %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Lo spazio libero su disco è inferiore a %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Il file è stato eliminato dal server</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Il file non può essere scaricato completamente.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>Il file scaricato è vuoto nonostante il server indicasse una dimensione di %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Il file è stato modificato dal suo rilevamento</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Errore durante la scrittura dei metadati nel database</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Il file %1 non può essere rinominato in %2 a causa di un conflitto con il nome di un file locale</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Questa cartella non può essere rinominata. Il nome originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Questa cartella non può essere rinominata. Ripristina il nome Shared.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Il file è stato rinominato, ma è parte di una condivisione in sola lettura. Il file originale è stato ripristinato.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>File rimosso</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Il file locale è stato modificato durante la sincronizzazione. Sarà ripristinato.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Un file locale è cambiato durante la sincronizzazione.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>URL di richiesta mancante</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Il file locale è stato rimosso durante la sincronizzazione.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Il server non ha riconosciuto l'ultimo pezzo. (Non era presente alcun e-tag)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Errore durante la scrittura dei metadati nel database</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Percorso di ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>Condivisione %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Cartella: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Il server non consente la condivisione</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Recupero di tutti i permessi di condivisione possibili dal server...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Copia co&llegamento</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Consenti la modifica</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Proteggi con p&assword</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Protetta da password</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>La condivisione pubblic&a richiede una password</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>imposta la password</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>Condividi colle&gamento</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Errore di accesso</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Successo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Errore grave di parametro di CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<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="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Errore durante la lettura della cartella.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Il file/cartella è ignorato poiché è nascosto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Sono disponibili solo %1, servono almeno %2 per iniziare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Errore non specificato di CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Interrotto dall'utente</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync non è riuscito ad accedere</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>Problema di CSync a causa di un permesso negato non gestito.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<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="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Il servizio è temporaneamente non disponibile</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>L'accesso è vietato</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Il nome del file è troppo lungo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Stat non riuscita.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<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="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Caratteri non validi, rinomina "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Impossibile leggere la lista nera dal database locale</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Impossibile leggere dal registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Il nome del file contiene almeno un carattere non valido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Spostamento non consentito, elemento ripristinato</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>la destinazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>l'origine</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versione %1. Per ulteriori informazioni vedi <a href="%2">3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuito da %1 e sotto licenza GNU General Public License (GPL) versione 2.0.<br/>%2 e il logo di %2 sono marchi registrati di %1 negli Stati Uniti, in altri paesi o entrambi.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Accedi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Cartella %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Nessuna cartella configurata per la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Non è stata configurata alcuna cartella per la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Apri nel browser</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Accedi...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Modifiche recenti</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Controllo delle modifiche in '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Cartelle gestite:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Apri la cartella '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Apri %1 nel browser...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Stato sconosciuto</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Impostazioni...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Dettagli...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Aiuto</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Esci da %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Disconnesso dal %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Versione del server non supportata</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Il server dell'account %1 esegue una versione %2 datata e non supportata. L'utilizzo del client con versioni non supportate non è sperimentato ed è potenzialmente pericoloso. Continua a tuo rischio.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Disconnesso dagli account:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Account %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>La sincronizzazione dell'account è disabilitata</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Riprendi tutte le cartelle</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Sospendi tutte le cartelle</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Riprendi tutte le sincronizzazioni</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Riprendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Sospendi tutte le sincronizzazioni</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Sospendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Disconnetti tutti gli account</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Accedi a tutti gli account...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Chiusura immediata</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Nessun elemento sincronizzato di recente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizzazione di %1 di %2 (%3 rimanenti)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizzazione di %1 (%2 rimanenti)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
- <translation><p>Versione %2. Per ulteriori informazioni, visita <a href="%3">%4</a></p><p><small>Di Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e altri.</small></p><p>Copyright ownCloud GmbH</p><p>Sotto licenza GNU General Public License (GPL) versione 2.0<br/>ownCloud e il logo di ownCloud sono marchi registrati di ownCloud, Inc. negli Stati Uniti, in altri paesi o entrambi.</p></translation>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>EtichettaTesto</translation>
</message>
<translation>Avvia una nuova sin&cronizzazione (Cancella la cartella locale!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Scegli cosa sincronizzare</translation>
</message>
<translation>Sincroni&zza tutto dal server</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Messaggio di stato</translation>
</message>
<translation>Modulo</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>Nome &utente</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Password</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Etichetta di errore</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>EtichettaTesto</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>nel futuro</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n giorno fa</numerusform><numerusform>%n giorni fa</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n ora fa</numerusform><numerusform>%n ore fa</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>adesso</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Meno di un minuto fa</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minuto fa</numerusform><numerusform>%n minuti fa</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Tempo fa</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>% anno</numerusform><numerusform>%n anni</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n mese</numerusform><numerusform>%n mesi</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n giorno</numerusform><numerusform>%n giorni</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n ora</numerusform><numerusform>%n ore</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuto</numerusform><numerusform>%n minuti</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n secondo</numerusform><numerusform>%n secondi</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Compilato dalla revisione Git <a href="%1">%2</a> il %3, %4 utilizzando Qt %5, %6</small><p></translation>
</message>
<translation>Errore</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Sconosciuto</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>scaricamento in corso</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>caricamento in corso</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>eliminazione</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>spostamento</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorare</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>errore</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>指定先のファイルは予期しないサイズまたは変更時間です</translation>
</message>
<translation>チェックしていないフォルダーはローカルファイルシステムから <b>削除</b>され､このコンピューターと同期されなくなります。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>適用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
<translation><server> に <user> で接続中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>新規追加</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>アカウント</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>同期フォルダーを選択</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>同期フォルダー接続を削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>フォルダーの作成に失敗しました</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>同期フォルダー接続の削除を確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>同期フォルダー接続を削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 を使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation><i>%2</i> の %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>サーバーバージョン %1 は古くサポートされていません！自己責任で進んでください。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>%1 に接続</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>サーバー %1 は一時的に利用できません</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>%1 からサインアウトしました。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation>%2 の %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>ログイン</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>容量が大きいため、同期されていない新規フォルダーがあります:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>アカウント削除確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>接続削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>フォルダーを開く</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>ログアウト</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>再開</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>一時停止</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%2 のうち %1 を使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>サーバーアクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>同期状況</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>無視またはエラーになったファイルのリスト</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>コピー</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>アクティビティ一覧をコピーする</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>同期対象外</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>未同期 (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>サーバアクティビティリストをクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>同期状況をクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>非同期アイテムリストをクリップボードにコピーしました。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>クリップボードにコピー</translation>
</message>
<translation><br/>%1 アカウントは、 アクティビティを有効にしていません。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>%2 から %n の新しい通知がありました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>%1 と %2 から %n の新しい通知がありました。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>%1 と %2 、その他アカウントから新しい通知がありました。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>通知 %1 - 操作が必要です。</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation>ユーザーによって中止されました</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 はフォルダーのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移動しました。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 とその他 %n 個のファイルが削除されました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 とその他 %n 個のファイルがダウンロードされました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 とその他 %n 個のファイルが更新されました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 を %2 にファイル名を変更し、その他 %n 個のファイル名を変更しました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 を %2 に移動し、その他 %n 個のファイルを移動しました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 と その他 %n 個のファイルが同期で衝突しました。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 が同期で衝突しています。コンフリクトファイルを確認してください。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>エラーにより、%1 と その他 %n 個のファイルが同期できませんでした。ログで詳細を確認してください。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>エラーにより %1 が未同期です。ログで詳細を確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>システム上の除外ファイルを読み込めません</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>この同期のタイミングで同期フォルダー '%1' のファイルが古いファイルに戻る可能性があります。
-これはサーバーのファイルがバックアップとして復旧されるかもしれないからです。
-このまま同期を続けた場合、あたらしいファイルが全て古いファイルで上書きされます。ローカルファイルで新しいものをコンフリクトファイルとして保持しますか？</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>バックアップが検出されました</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>正常同期</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>コンフリクト時にローカルファイルを保持</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>フォルダーの状態をリセットできませんでした</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(バックアップ)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(%1をバックアップ)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、一部のファイルに問題がありました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>有効なフォルダーが選択されていません！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>指定のパスは、フォルダーではありません！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>選択されたフォルダーに書き込み権限がありません</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>残り %5、%2中 %1完了 、%4中 %3 ファイル完了</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>%1 / %2 ファイル</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>待機中...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>%n 他のフォルダーの完了待ち...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>同期の準備中...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>サーバーからE-Tagを受信できません。プロキシ/ゲートウェイを確認してください。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>同期再開時に違う E-Tagを受信しました。次回リトライします。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>サーバーが間違ったcontent-rangeを返しました</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>接続タイムアウト</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>%1 のパスワードを入れてください:
-
-ユーザー名: %2
-アカウント: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>鍵情報の読み込みに失敗しました。エラー： '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>パスワードを入力してください</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>接続タイムアウト</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>メール(&E)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>%1 に接続中</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>ユーザー資格情報を入力</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">正常に %1 へ接続されました：%2 バージョン %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>%2 の %1 に接続に失敗:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>%2 の %1 へ接続を試みた際にタイムアウトしました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>%2 の %1 へ接続を試みています...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>サーバーへの認証リクエストは '%1' へリダイレクトされました。URLは不正です、サーバーの設定に誤りがあります。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>認証された WebDav リクエストに不正な応答がありました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>サーバーによってアクセスが拒否されています。適切なアクセス権があるか検証するには、<a href="%1">ここをクリック</a>してブラウザーでサービスにアクセスしてください。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>ローカルの同期フォルダー %1 はすでに存在するため、同期の設定をしてください。<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>ローカル同期フォルダー %1 を作成中...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>失敗。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>ローカルフォルダー %1 を作成できませんでした</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>リモートフォルダーが指定されていません！</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>エラー: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>ownCloud上にフォルダーを作成中: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>リモートフォルダー %1 は正常に生成されました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>リモートフォルダー %1 はすでに存在します。同期のために接続しています。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>フォルダーの作成はHTTPのエラーコード %1 で終了しました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>指定された資格情報が間違っているため、リモートフォルダーの作成に失敗しました！<br/>前に戻って資格情報を確認してください。</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">おそらく資格情報が間違っているため、リモートフォルダーの作成に失敗しました。</font><br/>前に戻り、資格情報をチェックしてください。</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>リモートフォルダー %1 の作成がエラーで失敗しました。<tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>%1 からリモートディレクトリ %2 への同期接続を設定しました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>%1への接続に成功しました！</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>%1 への接続を確立できませんでした。もう一度確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>フォルダー名の変更に失敗しました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>フォルダーまたはその中にあるファイルが他のプログラムで開かれているため、フォルダーの削除やバックアップができません。フォルダーまたはファイルを閉じてから再試行するか、セットアップをキャンセルしてください。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>ローカルの同期フォルダー %1 は正常に作成されました！</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 接続ウィザード</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>フォルダー設定をスキップ</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>ダウンロードすると、空き容量が %1 になります</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>ディスク空き容量が %1 よりも少なくなっています</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>ファイルはサーバーから削除されました</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>このファイルのダウンロードは完了しませんでした</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>サーバーが通知しているファイルは %1 であるべきですが、ダウンロードファイルは空でした。</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
- <translation>%1 はローカルファイル名が衝突しているため保存できません！</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>ファイルは発見以降に変更されました</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>メタデータのデータベースへの書き込みに失敗</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>ファイル %1 はローカルファイル名が衝突しているため %2 に名前を変更できません</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>このフォルダー名は変更できません。元の名前に戻します。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>このフォルダー名は変更できません。名前を Shared に戻してください。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>ファイルの名前が変更されましたが、読み込み専用の共有の一部です。オリジナルのファイルが復元されました。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>誤ったHTTPコードがサーバーから返されました。201のはずが、"%1 %2"が返りました。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>ファイルを削除しました</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>ローカルファイルが同期中に変更されました。再開されます。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>ローカルのファイルが同期中に変更されました。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation>5.4.2 以下のQt でHTTP 接続リセットが強制終了されました</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>ポーリングURLがありません</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>ローカルファイルを同期中に削除します。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>サーバーは最終チャンクを認識しませんでした。(e-tag が存在しませんでした)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>メタデータのデータベースへの書き込みに失敗</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>OwnCloudのパス:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 を共有中</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>フォルダー: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>サーバーで共有を許可していません</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>サーバーから共有権限を取得できる最大数で取得しています</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>再共有権限がない共有ため、このファイルは共有できません。</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>&linkをコピー</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>編集を許可</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>パスワード保護(&A)</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>パスワード保護</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>再共有権限がない共有ため、このファイルは共有できません。</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>共有するにはパスワードが必要(&A)</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>パスワードを入力してください</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>リンク共有(&S)</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>ログインエラー</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSyncは内部ツリーの処理中にエラーに遭遇しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSyncで使用するメモリの確保に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSyncの致命的なパラメータエラーです。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>CSyncの処理ステップの更新に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSyncの処理ステップの調停に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSyncはそのプロキシで認証できませんでした。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSyncはプロキシもしくはサーバーの参照に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSyncは %1 サーバーでの認証に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>CSync failed to connect to the network.</source>
<translation>CSyncはネットワークへの接続に失敗しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>ネットワーク接続のタイムアウトが発生しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTPの伝送エラーが発生しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>サーバー上のマウント済フォルダーが一時的に利用できません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>フォルダーを開く際にエラーが発生しました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>フォルダーの読み込みエラー</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>隠しファイル/フォルダーのため無視されました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>%1 しか空き容量がありません、開始するためには少なくとも %2 は必要です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: %1 サーバーには利用可能な空き領域がありません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSyncの未指定のエラーです。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>ユーザーによって中止されました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync は接続できませんでした</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync が処理できないパーミション拒否により失敗しました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSyncはすでに存在するフォルダーを作成しようとしました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>サーバーは一時的に利用できません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>アクセスが禁止されています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>内部エラー番号 %1 が発生しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>このアイテムは以前にエラーが発生したため同期しません: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同期機能はシンボリックリンクをサポートしていません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>ファイルは除外リストに登録されています。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>ファイル名が長すぎます</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>情報取得エラー</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>ファイル名のエンコーディングが無効です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>無効な文字です、"%1" を変更してください。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation>同期ジャーナルの初期化ができません。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>ローカルデータベースからブラックリストを読み込みできません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>同期ジャーナルから読み込みできません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>ファイル名に1文字以上の無効な文字が含まれています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>"同期対象先" ブラックリストにより無視されました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>削除できないので復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>ローカルファイルと共有フォルダーを削除しました。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>移動できないので項目を復元しました</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation>%1 は読み取り専用のため移動できません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>移動先</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>移動元</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>バージョン %1. 詳細な情報は<a href='%2'>%3</a>を確認してください。</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>%1 が配布し、 GNU General Public License (GPL) バージョン2.0 の下でライセンスされています。<br/>%2 及び %2 のロゴはアメリカ合衆国またはその他の国、あるいはその両方における %1 の登録商標です。</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>サインインしてください</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>フォルダー %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>同期フォルダーが設定されていません。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>同期するフォルダーがありません。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>ブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>ログイン...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>ログアウト</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>最近変更されたファイル</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>'%1' の更新を確認しています</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>管理フォルダー:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>フォルダー ’%1’ を開く</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>%1をブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>不明な状態</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>設定...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>詳細...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>ヘルプ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>%1 を終了</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>%1 から切断されました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>サポートされていないサーバーバージョン</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>%1 アカウントのサーバーのバージョン %2 は古く、未サポートです。この未サポートのサーバーバージョンとこのクライアントでの組み合わせは、未テストで潜在的な危険があります。ご利用は自己責任でお願いいたします。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>アカウントから切断:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>アカウント %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>アカウントの同期は無効になっています</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>すべてのフォルダーの同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>すべてのフォルダーの同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>すべての同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>すべての同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>全てのアカウントからログアウト</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>全てのアカウントにログイン</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>クラッシュしました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>最近同期されたアイテムはありません。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>同期中 %2 中 %1 (残り %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>同期中 %1 (残り %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>最新です</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>テキストラベル</translation>
</message>
<translation>クリーン同期を開始(ローカルフォルダーは削除されます！)(&C)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>同期フォルダーを選択</translation>
</message>
<translation>サーバーからすべてのファイルを同期(&Y)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>状態メッセージ</translation>
</message>
<translation>フォーム</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>ユーザー名(&U)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>パスワード(&P)</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>エラーラベル</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>テキストラベル</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>今後</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n日前</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n 時間前</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>今</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>1分以内</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform> %n 分前</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>数分前</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n 年</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n ヶ月</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n 日</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n 時間</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n 分</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n 秒</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small><a href="%1">%2</a> %3, %4 のGitリビジョンからのビルド Qt %5, %6 を利用</small></p></translation>
</message>
<translation>エラー</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>不明</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>ダウンロード中</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>アップロード中</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>削除しています</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>移動しています</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>除外:</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>エラー</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Målfilen har uventet størrelse eller endringstidspunkt</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<translation>Tilkoblet <server> som <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Ingen konto konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Legg til ny</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Fjern</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Velg hva som synkroniseres</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Fjern tilkobling for mappe-synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Oppretting av mappe feilet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bekreft fjerning av tilkobling for mappe-synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Fjern tilkobling for mappe-synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Synkroniserer...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 i bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 som <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Server-versjonen %1 er gammel og støttes ikke! Fortsett på egen risiko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Tilkoblet %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 er midlertidig utilgjengelig.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Logget ut fra %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Logg inn</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Det finnes nye mapper som ikke ble synkronisert fordi de er for store: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Bekreft fjerning av konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Fjern tilkobling</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Åpne mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Logg ut</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Fortsett synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Sett synkronisering på pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 av %2 i bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1-forbindelse konfigurert.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Server-aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Synkroniseringsprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Liste over filer som er ignorert eller har feil</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopier</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopier aktivitetslisten til utklippstavlen.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Ikke synkronisert</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Ikke synkronisert (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Server-aktivitetslisten er kopiert til utklippstavlen.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Synkroniserings-aktivitetslisten er kopiert til utklippstavlen.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Listen med usynkroniserte elementer er kopiert til utklippstavlen.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Kopiert til utklippstavlen</translation>
</message>
<translation><br/>Konto %1 har ikke aktiviteter aktivert.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Du mottok %n nytt varsel fra %2.</numerusform><numerusform>Du mottok %n nye varsler fra %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Du mottok %n nytt varsel fra %1 og %2.</numerusform><numerusform>Du mottok %n nye varsler fra %1 og %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Du mottok nye varsler fra %1, %2 og andre kontoer.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 varsler - Handling kreves</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokal mappe %1 eksisterer ikke.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 skal være en mappe men er ikke det.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 kan ikke leses.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt fjernet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt lastet ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt oppdatert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har blitt omdøpt til %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har blitt flyttet til %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 og %2 annen fil har blitt fjernet.</numerusform><numerusform>%1 og %2 andre filer har blitt fjernet.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 og %2 annen fil har blitt lastet ned.</numerusform><numerusform>%1 og %2 andre filer har blitt lastet ned.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 og %2 annen fil har blitt oppdatert.</numerusform><numerusform>%1 og %2 andre filer har blitt oppdatert.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 er blitt omdøpt til %2 og %n annen fil har blitt omdøpt.</numerusform><numerusform>%1 er blitt omdøpt til %2 og %n andre filer har blitt omdøpt.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 er blitt flyttet til %2 og %n annen fil har blitt flyttet.</numerusform><numerusform>%1 er blitt flyttet til %2 og %n andre filer har blitt flyttet.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform><numerusform>%1 og %n andre filer har synkroniseringskonflikter.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 har en synkroniseringskonflikt. Sjekk konflikt-filen.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform><numerusform>%1 og %n andre filer kunne ikke synkroniseres pga. feil. Se loggen for detaljer.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunne ikke synkroniseres pga. en feil. Se loggen for detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Synkroniseringsaktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>Klarte ikke å lese systemets ekskluderingsfil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Fjerne alle filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Fjern alle filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Behold filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Denne synkroniseringen vil tilbakestille filene til et tidligere tidspunkt i mappe '%1'.
-Dette kan være fordi en backup ble gjenopprettet på serveren.
-Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrevet av en eldre fil i en tidligere tilstand. Ønsker du å beholde dine ferskeste lokale filer som konflikt-filer?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Backup oppdaget</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Behold lokale filer som konflikt</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Klarte ikke å tilbakestille mappetilstand</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation> (sikkerhetskopi)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation> (sikkerhetskopi %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Udefinert tilstand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Venter på å starte synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Forbereder synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Synkronisering kjører.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Siste synkronisering var vellykket.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Feil med oppsett.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Brukeravbrudd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Synkronisering er satt på pause.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronisering er satt på pause)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Ingen gyldig mappe valgt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 igjen, %1 av %2, fil %3 of %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>fil %1 av %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Venter..</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Forbereder synkronisering...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Serveren returnerte feil content-range</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Tidsavbrudd ved tilkobling</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Vennligst legg inn %1-passord:
-
-Bruker: %2
-Konto: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<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"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Legg inn passord</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Forbindelsen fikk tidsavbrudd</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&E-post</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Koble til %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Legg inn påloggingsinformasjon</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Vellykket oppkobling mot %1: %2 versjon %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Klarte ikke å koble til %1 på %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Tidsavbrudd ved oppkobling mot %1 på %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Prøver å koble til %1 på %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Autentisert forespørsel til serveren ble omdirigert til '%1'. URL-en er ugyldig, serveren er feilkonfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Det kom et uventet svar fra en autentisert webdav-forespørsel.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Tilgang forbudt av serveren. For å sjekke om du har gyldig tilgang, <a href="%1">klikk her</a> for å aksessere tjenesten med nettleseren din.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokal synkroniseringsmappe %1 finnes allerede. Setter den opp for synkronisering.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Oppretter lokal synkroniseringsmappe %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>feilet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Klarte ikke å opprette lokal mappe %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Ingen ekstern mappe spesifisert!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Feil: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>oppretter mappe på ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Ekstern mappe %1 ble opprettet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Ekstern mappe %1 finnes allerede. Kobler den til for synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Oppretting av mappe resulterte i HTTP-feilkode %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Oppretting av ekstern mappe feilet fordi påloggingsinformasjonen er feil!<br/>Gå tilbake og sjekk brukernavnet og passordet ditt.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Oppretting av ekstern mappe feilet, sannsynligvis fordi oppgitt påloggingsinformasjon er feil.</font><br/>Vennligst gå tilbake og sjekk ditt brukernavn og passord.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Oppretting av ekstern mappe %1 feilet med feil <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>En synkroniseringsforbindelse fra %1 til ekstern mappe %2 ble satt opp.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Forbindelse til %1 opprettet!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Klarte ikke å etablere forbindelse til %1. Sjekk igjen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Omdøping av mappe feilet</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Kan ikke fjerne og sikkerhetskopiere mappen fordi mappen eller en fil i mappen er åpen i et annet program. Lukk mappen eller filen og prøv igjen, eller avbryt oppsettet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Oppretting av lokal synkroniseringsmappe %1 vellykket!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Veiviser for tilkobling</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Hopp over mappekonfigurasjon</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Nedlastingen ville ha redusert ledig diskplass til under %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Ledig plass på disk er mindre enn %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Filen ble slettet fra serveren</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Hele filen kunne ikke lastes ned.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>Nedlastet fil er tom, selv om serveren annonserte at den skulle være %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Filen er endret siden den ble oppdaget</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Feil ved skriving av metadata til databasen</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Fil %1 kan ikke omdøpes til %2 på grunn av lokalt sammenfall av filnavn</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denne mappen må ikke omdøpes. Den er omdøpt tilbake til sitt opprinnelige navn.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Denne mappen må ikke omdøpes. Vennligst omdøp den tilbake til Shared.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Filen ble gitt nytt navn mer er en del av en deling med lesetilgang. Den opprinnelige filen ble gjenopprettet.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Feil HTTP-kode returnert fra server. Ventet 201, men mottok "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Fil fjernet</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Lokal fil endret under synkronisering. Den vil gjenopptas.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Lokal fil endret under synkronisering.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Forespørsels-URL mangler</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Den lokale filen ble fjernet under synkronisering.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Serveren godtok ikke den siste deloverføringen. (Ingen e-tag var tilstede)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Feil ved skriving av metadata til databasen</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>ownCloud-sti:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1-deling</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Mappe: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Serveren tillater ikke deling</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Henter maksimalt mulige delerettigheter fra serveren...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Kopier &lenke</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Tillat redigering</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>P&assordbeskyttelse</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Passordbeskyttet</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Offentlig d&eling krever et passord</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Sett passord</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Del lenke</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Innloggingsfeil</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Suksess.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync klarte ikke å reservere minne.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatal parmeterfeil.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>CSync-behandlingssteg oppdatering feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync-behandlingssteg overensstemming feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>En HTTP-overføringsfeil oppstod.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<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="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Feil ved lesing av mappe.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Filen/mappen ignoreres fordi den er skjult.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Bare %1 er tilgjengelig, trenger minst %2 for å begynne</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync uspesifisert feil.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Avbrutt av brukeren</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync klarte ikke å aksessere</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync feilet fordi nektet tilgang ikke ble håndtert.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<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="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Tjenesten er midlertidig utilgjengelig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Tilgang er nektet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>Filen ligger på ignoreringslisten.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Filnavn er for langt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Stat feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Filnavn-koding er ikke gyldig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation>Kan ikke initialisere en synkroniseringsjournal.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kan ikke lese svartelisten fra den lokale databasen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Kan ikke lese fra synkroniseringsjournalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Kan ikke åpne synkroniseringsjournalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Filnavnet inneholder minst ett ulovlig tegn</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Ikke tillatt å fjerne, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>Lokale filer og delingsmappe fjernet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Flytting ikke tillatt, element gjenopprettet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>målet</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>kilden</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versjon %1. For mer informasjon gå til <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuert av %1 og lisensiert under GNU General Public License (GPL) Version 2.0.<br/>%2 og %2-logoet er registrerte varemerker for %1 i USA, i andre land eller begge deler.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Vennligst logg inn</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Mappe %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Ingen synkronisering-mapper konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Ingen synkroniseringsmapper er konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Åpne i nettleser</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Logg inn..</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Logg ut</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Siste endringer</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Ser etter endringer i '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Administrerte mapper:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Åpne mappe '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Åpne %1 i nettleser</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Ukjent status</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Innstillinger...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Detaljer...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Hjelp</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Avslutt %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Koble fra %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Server-versjonen støttes ikke</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Serveren på konto %1 kjører en gammel %2 som ikke støttes. Bruk av denne klienten med ikke-støttede server-versjoner er ikke testet og kan være farlig. Fortsett på egen risiko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Koblet fra kontoer:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Kontosynkronisering er deaktivert</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Fortsett alle mapper</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Sett alle mapper på pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Fortsett all synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Fortsett synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Sett all synkronisering på pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Sett synkronisering på pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Logg ut av alle kontoer</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Logg inn på alle kontoer...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Krasj nå</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Ingenting synkronisert nylig</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synkroniserer %1 av %2 (%3 gjenstår)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synkroniserer %1 (%2 gjenstår)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Oppdatert</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Tekst-etikett</translation>
</message>
<translation>Start en &ren synkronisering (sletter den lokale mappen!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Velg hva som synkroniseres</translation>
</message>
<translation>S&ynkroniser alt fra serveren</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Statusmelding</translation>
</message>
<translation>Skjema</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Brukernavn</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Passord</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Feiletikett</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Tekst-etikett</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>LTR</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>fram i tid</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>i går</numerusform><numerusform>for %n dager siden</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>for %n time siden</numerusform><numerusform>for %n timer siden</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>nå</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>For mindre enn et minutt siden</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>for %n minutt siden</numerusform><numerusform>for %n minutter siden</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>For en stund siden</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n måned</numerusform><numerusform>%n måneder</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n dag</numerusform><numerusform>%n dager</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n time</numerusform><numerusform>%n timer</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minutt</numerusform><numerusform>%n minutter</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekund</numerusform><numerusform>%n sekunder</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Bygget fra Git-revisjon <a href="%1">%2</a> %3, %4 med Qt %5, %6</small></p></translation>
</message>
<translation>Feil</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Ukjent</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>laster ned</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>laster opp</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>sletter</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>flytter</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorerer</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>feil</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Het doelbestand heeft een onverwachte omvang of tijdstempel</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Toepassen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
<translation>Verbonden met <server> als <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Geen account ingesteld.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Toevoegen nieuw</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Verwijder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Selectieve synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Verwijderen map sync verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Maken map mislukt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bevestig verwijderen Map Sync verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Verwijderen Map Sync verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Bezig met synchroniseren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 in gebruik</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 als <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>De serverversie %1 is oud en wordt niet meer ondersteund. Verdergaan is op eigen risico.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Verbonden met %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 is tijdelijk niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Uitgelogd van %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Meld u aan</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Er zijn nieuwe mappen die niet gesynchroniseerd werden, omdat ze te groot zijn:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Bevestig verwijderen account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Verwijderen verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Openen map</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Afmelden</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Hervatten sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Pauzeren sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 van %2 in gebruik</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Serveractiviteit</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Synchronisatiegeschiedenis</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Lijst van genegeerde of foutieve bestanden</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopieer de activiteitenlijst naar het klembord.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Niet gesynchroniseerd</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Niet gesynchroniseerd (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>De server activiteitenlijst is gekopieerd naar het klembord.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>De sync activiteitenlijst is gekopieerd naar het klembord.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>De lijst met niet gesyncte objecten is gekopieerd naar het klembord.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Gekopieerd naar het klembord</translation>
</message>
<translation><br/>Account %1 heeft geen activiteiten ingeschakeld.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>U ontving %n nieuw bericht van %2.</numerusform><numerusform>U ontving %n nieuwe berichten van %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>U ontving %n nieuwe melding(en) van %1 en %2.</numerusform><numerusform>U ontving %n nieuwe melding(en) van %1 en %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Je hebt nieuwe berichten ontvangen van %1, %2 en andere acounts</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Berichten - Actie verwacht</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokale map %1 bestaat niet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 zou een map moeten zijn, maar is dat niet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 is verwijderd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 is gedownload.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 is bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 is hernoemd naar %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 en %n ander bestand(en) zijn verwijderd.</numerusform><numerusform>%1 en %n andere bestand(en) zijn verwijderd.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 en %n ander bestand(en) zijn gedownload.</numerusform><numerusform>%1 en %n andere bestand(en) zijn gedownload.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 en %n ander bestand(en) zijn bijgewerkt.</numerusform><numerusform>%1 en %n andere bestand(en) zijn bijgewerkt.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 is hernoemd naar %2 en %n ander bestand(en) is hernoemd.</numerusform><numerusform>%1 is hernoemd naar %2 en %n andere bestand(en) zijn hernoemd.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 is verplaatst naar %2 en %n ander bestand(en) is verplaatst.</numerusform><numerusform>%1 is verplaatst naar %2 en %n andere bestand(en) zijn verplaatst.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 en %n ander bestand(en) hebben een sync conflict.</numerusform><numerusform>%1 en %n andere bestand(en) hebben sync conflicten.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 heeft een sync conflict. Controleer het conflict bestand!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 en %n ander bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform><numerusform>%1 en %n andere bestand(en) konden niet worden gesynchroniseerd wegens fouten. Bekijk het log voor details.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kon niet worden gesynchroniseerd door een fout. Bekijk het log voor details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Deze synchronisatie zou uw bestanden terug zetten naar een eerdere staat van de synchronisatie map '%1'.
-Dit kan komen doordat een backup is hersteld op de server.
-Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere versie. Wilt u uw lokale meer recentere bestanden behouden als conflict bestanden?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Backup gedetecteerd</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Normale synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Behoud lokale bestanden als conflict</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<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="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was geslaagd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Geen geldige map geselecteerd!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 over, %1 van %2, bestand %3 van %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>bestand %1 van %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Aan het wachten...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Voorbereiden op sync...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Server retourneerde verkeerde content-bandbreedte</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Verbindingstime-out</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Voer %1 wachtwoord in:
-
-gebruiker: %2
-account: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>Het lezen van de sleutelketen is mislukt met fout: '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Vul het wachtwoord in</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Verbinding time-out</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&E-mail</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Verbinden met %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Vul uw inloggegevens in</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Succesvol verbonden met %1: %2 versie %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Kon geen verbinding maken met %1 op %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Time-out bij verbinden met %1 om %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Probeer te verbinden met %1 om %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>De geauthentiseerde aanvraag voor de server werd omgeleid naar '%1'. De URL is onjuist, de server is verkeerd geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Er was een ongeldig antwoord op een geauthenticeerde webdav opvraging</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Toegang door server verboden. Om te verifiëren dat u toegang mag hebben, <a href="%1">klik hier</a> om met uw browser toegang tot de service te krijgen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokale synch map %1 bestaat al, deze wordt ingesteld voor synchronisatie.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Creëren lokale sync map %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>mislukt.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Kon lokale map %1 niet aanmaken</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Geen externe map opgegeven!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Fout: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>aanmaken map op ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Externe map %1 succesvol gecreërd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>De remote map %1 bestaat al. Verbinden voor synchroniseren.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Het aanmaken van de map resulteerde in HTTP foutcode %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.<br/>Ga terug en controleer uw inloggegevens.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.</font><br/>ga terug en controleer uw inloggevens.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Aanmaken van remote map %1 mislukt met fout <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Er is een sync verbinding van %1 naar remote directory %2 opgezet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Succesvol verbonden met %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Verbinding met %1 niet geslaagd. Probeer het nog eens.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Hernoemen map mislukt</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Kan de map niet verwijderen en backuppen, omdat de map of een bestand daarin, geopend is in een ander programma. Sluit de map of het bestand en drup op Opnieuw of annuleer de installatie.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokale synch map %1 is succesvol aangemaakt!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Verbindingswizard</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Sla configuratie van mappen over</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>De download zou de vrije schijfruimte beperken tot onder %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Vrije schijfruimte is minder dan %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Bestand was verwijderd van de server</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Het bestand kon niet volledig worden gedownload.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>Het gedownloade bestand is leeg, hoewel de server meldde dat het %1 zou moeten zijn.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Het bestand is gewijzigd sinds het is gevonden</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Fout bij schrijven van Metadata naar de database</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Bestand %1 kan niet worden hernoemd naar %2, omdat de naam conflicteert met een lokaal bestand</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Deze map mag niet worden hernoemd. De naam van de map is teruggezet naar de originele naam.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Deze map mag niet worden hernoemd. Verander de naam terug in Gedeeld.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Het bestand is hernoemd, maar hoort bij een alleen-lezen share. Het originele bestand is teruggezet.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Foutieve HTTP code ontvangen van de server. Verwacht werd 201, maar ontvangen "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Bestand verwijderd</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Lokaal bestand gewijzigd bij sync. Wordt opnieuw meengenomen.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Lokaal bestand gewijzigd bij sync.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>URL opvraag ontbreekt</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Het lokale bestand werd verwijderd tijdens sync.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>De server heeft het laatste deel niet bevestigd (er was geen e-tag aanwezig)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Fout bij schrijven van Metadata naar de database</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>OwnCloud Pad:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 Delen</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Map: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>De server staat delen niet toe</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Maximum aantal mogelijke permissies van de server ophalen...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Kopiëren &link</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Toestaan bewerken</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>&Wachtwoord beveiligd</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Wachtwoord beveiligd</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Openbaar de&len vereist een wachtwoord</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Stel uw wachtwoord in</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Deel link</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Inlogfout</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Succes.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync kon geen geheugen reserveren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatale parameter fout.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>CSync verwerkingsstap bijwerken mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync verwerkingsstap verzamelen mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>Er trad een HTTP transmissiefout plaats.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<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="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Fout tijdens lezen map.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Bestand/Map is genegeerd omdat het verborgen is. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync ongedefinieerde fout.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Afgebroken door de gebruiker</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Bestandsnaam bevat ongeldige tekens die niet tussen platformen gesynchroniseerd kunnen worden.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync kreeg geen toegang</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync mislukt omdat de benodigde toegang werd geweigerd.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<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="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>De dienst is tijdelijk niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Toegang verboden</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolische links worden niet ondersteund bij het synchroniseren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>De bestandsnaam is te lang.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Stat mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Bestandsnaamcodering is niet geldig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Ongeldige tekens, hernoem "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kan de blacklist niet lezen uit de lokale database</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Niet mogelijk om te lezen uit het synchronisatie verslag.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync transactielog niet openen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>De bestandsnaam bevat ten minste één ongeldig teken</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan om te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Verplaatsen niet toegestaan, object hersteld</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>bestemming</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>bron</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versie %1. Voor meer informatie bezoek <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Copyright ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Gedistribueerd door %1 en gelicenseerd onder de GNU General Public License (GPL) Versie 2.0.<br/>%2 en het %2 logo zijn geregistreerde handelsmerken van %1 in de Verenigde Staten, in andere landen of beide.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Log alstublieft in</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Map %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Geen synchronisatie-mappen geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Er zijn geen synchronisatie-mappen geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Open in browser</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Inloggen...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Afmelden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Recente wijzigingen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Controleren op wijzigingen in '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Beheerde mappen:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Open map '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Onbekende status</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Instellingen...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Details ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Help</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>%1 afsluiten</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Losgekoppeld van %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Niet-ondersteunde server versie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>De server van account %1 gebruikt een oude versie %2. Het gebruik van deze clientsoftware met niet-ondersteunde server versies is niet getest en mogelijk gevaarlijk. Verdergaan is voor uw eigen risico.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Losgekoppeld van account:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Account %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Account synchronisatie is uitgeschakeld</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Hervat alle mappen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Pauzeer alle mappen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Hervat alle synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Hervat synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Pauzeer alle synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Pauzeer synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Uitloggen van alle accounts...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Inloggen op alle accounts...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Crash nu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Recent niets gesynchroniseerd</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sync %1 van %2 (%3 over)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sync %1 (%2 over)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
- <translation><p>Versie %2. Bezoek voor meer informatie bezoek <a href="%3">%4</a>.</p><p><small>Door Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz en anderen.</small></p><p>Copyright ownCloud, GmbH</p><p>Gelicenseerd onder de GNU General Public License (GPL) Versie 2.0<br>ownCloud en het ownCloud logo zijn geregistreerde handelsmerken van ownCloud, Inc. in de Verenigde Staten, andere landen, of beide.</p></translation>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TekstLabel</translation>
</message>
<translation>Starten &Schone sync (maakt lokale map leeg!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Selectieve synchronisatie</translation>
</message>
<translation>S&ynchroniseer alles vanaf de server</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Statusbericht</translation>
</message>
<translation>Formulier</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Gebruikersnaam</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Wachtwoord</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Foutlabel</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Tekstlabel</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>in de toekomst</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dag geleden</numerusform><numerusform>%n dagen geleden</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n uur geleden</numerusform><numerusform>%n uur geleden</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>nu</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Minder dan een minuut geleden</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minuut geleden</numerusform><numerusform>%n minuten geleden</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Even geleden</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n jaar</numerusform><numerusform>%n jaar</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n maand</numerusform><numerusform>%n maanden</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n dag</numerusform><numerusform>%n dagen</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n uur</numerusform><numerusform>%n uur</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuut</numerusform><numerusform>%n minuten</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n seconde</numerusform><numerusform>%n seconde(n)</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Gebouwd vanuit Git revisie <a href="%1">%2</a> op %3, %4 gebruik makend van Qt %5, %6</small></p></translation>
</message>
<translation>Fout</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Onbekend</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>downloaden</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>uploaden</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>verwijderen</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>verplaatsen</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>negerend</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>fout</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Plik docelowy ma nieznaną wielkość lub datę modyfikacji</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Zastosuj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
<translation>Połączony z <server> jako <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Brak skonfigurowanych kont.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Dodaj nowe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Usuń</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Wybierz co synchronizować</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Usuń folder połączenia synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Nie udało się stworzyć katalogu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Usuń folder połączenia synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Usuń folder połączenia synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Synchronizacja uruchomiona</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 w użyciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 jako <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Wersja serwera %1 jest przestarzała i nie jest już wspierana. Kontynuujesz na własne ryzyko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Podłączony do %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Serwer %1 jest tymczasowo niedostępny.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Wylogowano z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Zaloguj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Istnieją nowe foldery, które nie zostały zsynchronizowane, gdyż są za duże.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Potwierdź usunięcie konta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Czy na pewno chcesz usunąć połączenie z kontem <i>%1</i>?</p><p><b>Uwaga:</b> ta operacja <b>nie</b> usunie plików klienta.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Usuwanie połączenia</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Otwórz katalog</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Wyloguj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Przywróć synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Zatrzymaj synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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>Czy na pewno chcesz zatrzymać synchronizację folderu <i>%1</i>?</p><p><b>Uwaga:</b> ta operacja <b>nie</b> usunie plików z klienta.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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 w użyciu. Niektóre foldery, w tym zamontowane lub udostępnione foldery w sieci, mogą mieć różne limity.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 z %2 w użyciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Aktywność serwera</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protokół synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Lista pominiętych lub błędnych plików</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopiuj</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiuj listę aktywności do schowka.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Niezsynchronizowany</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Niezsynchronizowany (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Log aktywności serwera został skopiowany do schowka.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Przebieg synchronizacji został skopiowany do schowka.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Lista niezsynchronizowanych plików została skopiowana do schowka.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Skopiuj do schowka</translation>
</message>
<translation><br/>Użytkownik %1 nie ma włączonej historii aktywności.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Otrzymano %n nowe powiadomienie od %2.</numerusform><numerusform>Otrzymano %n nowe powiadomienia od %2.</numerusform><numerusform>Otrzymano %n nowych powiadomień od %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Otrzymano %n nowe powiadomienie od %1 i %2.</numerusform><numerusform>Otrzymano %n nowe powiadomienia od %1 i %2.</numerusform><numerusform>Otrzymano %n nowych powiadomień %1 i %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Otrzymałeś nowe powiadomienia z %1, %2 i innych kont.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Powiadomień - Wymagana akcja</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Błąd podczas zapisu metadanych do bazy</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Folder lokalny %1 nie istnieje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 powinien być katalogiem, ale nie jest.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 został usunięty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 został ściągnięty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 został uaktualniony.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 zmienił nazwę na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 i %n inny plik został usunięty.</numerusform><numerusform>%1 i %n inne pliki zostały usunięte.</numerusform><numerusform>%1 i %n innych plików zostało usuniętych.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 i %n inny plik został pobrany.</numerusform><numerusform>%1 i %n inne pliki zostały pobrane.</numerusform><numerusform>%1 i %n innych plików zostało pobranych.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 i %n inny plik został zaktualizowany.</numerusform><numerusform>%1 i %n inne pliki zostały zaktualizowane.</numerusform><numerusform>%1 i %n innych plików zostało zaktualizowanych.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 ma konflikt synchronizacji. Sprawdź konfliktujący plik!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nie może zostać zsynchronizowany z powodu błędu. Zobacz szczegóły w logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Nowy folder większy od %1 MB został dodany
Przejdź do ustawień i zaznacz go, jeśli chcesz go pobrać.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Czy jesteś pewien, że chcesz wykonać tę operację ? </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Bieżąca synchronizacja przywróci pliki do poprzedniego czasu w folderze %1.
-Być może została przywrócona kopia zapasowa serwera?
-Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwotny stan. Czy chcesz zatrzymać swoje ostatnie pliki i nadać im status konfliktu?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Wykryto kopię zapasową.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Normalna synchronizacja.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<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="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(kopia zapasowa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(kopia zapasowa %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Poczekaj na rozpoczęcie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Nie wybrano poprawnego folderu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>Wybrana ścieżka nie jest katalogiem!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Wybrany folder lokalny %1 jest już użyty na potrzeby innej synchronizacji. Proszę wybrać inny folder lokalny.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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>Lokalny folder %1 jest dowiązaniem symbolicznym. Cel dowiązania zawiera folder użyty na potrzeby innej synchronizacji. Proszę wybrać inny folder lokalny bądź dowiązanie.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>Plik %3 z %4, pozostało czasu %5 (%1 z %2)</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>plik %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Czekaj...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Przygotowanie do synchronizacji ...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Serwer zwrócił błędną zakres zawartości</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Limit czasu połączenia</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Proszę podać %1 hasło:
-
-Użytkownik: %2
-Konto: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Wprowadź hasło</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Przekroczono czas odpowiedzi</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&E-mail</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Podłącz do %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Wprowadź poświadczenia użytkownika</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Udane połączenie z %1: %2 wersja %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Nie udało się połączyć do %1 w %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Upłynął czas podczas próby połączenia do %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Próba połączenia z %1 w %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Dostęp zabroniony przez serwer. Aby sprawdzić, czy masz odpowiednie uprawnienia, kliknij <a href="%1">tutaj</a>, aby połączyć się z usługą poprzez przeglądarkę.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokalny folder synchronizacji %1 już istnieje. Ustawiam go do synchronizacji.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Tworzenie lokalnego folderu synchronizacji %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>Błąd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Nie udało się utworzyć lokalnego folderu %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Nie określono folderu zdalnego!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Błąd: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>tworzę folder na ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Zdalny folder %1 został utworzony pomyślnie.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Zdalny folder %1 już istnieje. Podłączam go do synchronizowania.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Tworzenie folderu spowodowało kod błędu HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Nie udało się utworzyć zdalnego folderu ponieważ podane dane dostępowe są nieprawidłowe!<br/>Wróć i sprawdź podane dane dostępowe.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Tworzenie folderu zdalnego nie powiodło się. Prawdopodobnie dostarczone poświadczenia są błędne.</font><br/>Wróć i sprawdź poświadczenia.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Tworzenie folderu zdalnego %1 nie powiodło się z powodu błędu <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Połączenie synchronizacji z %1 do katalogu zdalnego %2 zostało utworzone.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Udane połączenie z %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Połączenie z %1 nie może być nawiązane. Sprawdź ponownie.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Zmiana nazwy folderu nie powiodła się</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Nie można usunąć i zarchiwizować folderu ponieważ znajdujący się w nim plik lub folder jest otwarty przez inny program. Proszę zamknąć folder lub plik albo kliknąć ponów lub anuluj setup.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Utworzenie lokalnego folderu synchronizowanego %1 zakończone pomyślnie!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Kreator połączeń</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Pomiń konfigurację folderów</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Błąd podczas zapisu metadanych do bazy</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Pobranie zmniejszy ilość wolnego miejsca poniżej %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Wolne miejsce na dysku jest mniejsze niż %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Plik został usunięty z serwera</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Ten plik nie mógł być całkowicie pobrany.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Błąd podczas zapisu metadanych do bazy</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Plik %1 nie może być nazwany %2 z powodu kolizji z lokalną nazwą pliku</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Błąd podczas zapisu metadanych do bazy</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Folder ten nie może być zmieniony. Został zmieniony z powrotem do pierwotnej nazwy.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Nie wolno zmieniać nazwy tego folderu. Proszę zmień nazwę z powrotem na Shared.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Plik był edytowany lokalnie ale jest częścią udziału z prawem tylko do odczytu. Przywrócono oryginalny plik</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Błąd podczas zapisu metadanych do bazy</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Usunięto plik</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Lokalny plik zmienił się podczas synchronizacji.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Pliki lokalny został usunięty podczas synchronizacji.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Błąd podczas zapisu metadanych do bazy</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Ścieżka ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 udostępnione</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Folder: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Serwer nie zezwala na współdzielenie</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Kopiuj &link</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Pozwól na edycję</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Zabezpieczone hasłem</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Proszę podać hasło</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Błąd logowania</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Sukces.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync nie udało się wczytać pliku dziennika. Plik dziennika jest uszkodzony.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Krytyczny błąd parametru CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>Upłynął limit czasu połączenia.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>Wystąpił błąd transmisji HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Chwilowy brak dostępu do serwera, z którego montowany jest folder.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>Wystąpił błąd podczas otwierania katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Błąd podczas odczytu katalogu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Plik / katalog zostanie zignorowany, ponieważ jest ukryty.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania katalogu nadrzędnego</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Nieokreślony błąd CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Anulowane przez użytkownika</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Nazwa pliku zawiera niedozwolone znaki, przez co może nie być synchronizowany.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Usługa jest czasowo niedostępna</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Dostęp zabroniony</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Nazwa pliku zbyt długa</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Błąd statystyk.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Nie można czytać z dziennika synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podkatalogów w tym katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>Lokalne pliki i udostępniane foldery zostały usunięte.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Przenoszenie niedozwolone, obiekt przywrócony</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>docelowy</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>źródło</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Wersja %1. Aby uzyskać więcej informacji prosimy odwiedzić <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Proszę się zalogować</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Folder %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Nie skonfigurowano synchronizowanych folderów.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Nie skonfigurowano żadnych folderów synchronizacji.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Otwórz w przeglądarce</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Wyloguj</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Ostatnie zmiany</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Sprawdzanie zmian na '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Zarządzane foldery:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Otwórz katalog '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Otwórz %1 w przeglądarce</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Nieznany status</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Ustawienia...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Szczegóły...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Wyjdź %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Rozłączony z %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Nie wspierana wersja serwera</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Rozłączony z kontami:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Dostęp %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Konto synchronizacji jest wyłączone</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Wznów wszystkie katalogi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Wstrzymaj wszystkie katalogi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Wznów wszystkie synchronizacje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Wznów synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Wstrzymaj wszystkie synchronizacje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Wstrzymaj synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Wyloguj się się ze wszystkich kont</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Zaloguj się do wszystkich kont</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Brak ostatnich synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronizacja %1 z %2 (%3 pozostało)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronizuję %1 (%2 pozostało)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Aktualne</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Etykieta</translation>
</message>
<translation>Zacznij od &czystej synchronizacji (usuwa lokalny katalog !)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Wybierz co synchronizować</translation>
</message>
<translation>S&ynchronizuj wszystko z serwera</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Status wiadomości</translation>
</message>
<translation>Formularz</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Nazwa użytkownika</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Hasło</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Etykieta błędu</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Etykieta</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>w przyszłości</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dzień temu</numerusform><numerusform>%n dni temu</numerusform><numerusform>%n dni temu</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n godzinę temu</numerusform><numerusform>%n godziny temu</numerusform><numerusform>%n godzin temu</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>teraz</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Mniej niż minutę temu</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minutę temu</numerusform><numerusform>%n minuty temu</numerusform><numerusform>%n minut temu</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Jakiś czas temu</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n rok</numerusform><numerusform>%n lata</numerusform><numerusform>%n lat</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n miesiąc</numerusform><numerusform>%n miesiące</numerusform><numerusform>%n miesięcy</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n dzień</numerusform><numerusform>%n dni</numerusform><numerusform>%n dni</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n godzina</numerusform><numerusform>%n godziny</numerusform><numerusform>%n godzin</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuta</numerusform><numerusform>%n minuty</numerusform><numerusform>%n minut</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation type="unfinished"/>
</message>
<translation>Błąd</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Nieznany</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>pobieram</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>przesyłanie</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>usuwam</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>przenoszę</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorowane</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>błąd</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>O ficheiro de destino tem um tamanho inesperado ou a hora foi modificada</translation>
</message>
<translation>As pastas não selecionadas serão <b>removidas</b> do seu sistema de ficheiros local e já não serão sincronizadas para este computador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Ligado ao <server> como <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Adicionar nova</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Remover</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Escolher o que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Remover ligação de sincronização de pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Não foi possível criar a pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Não foi possível criar a pasta local<i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar Remoção da Ligação de Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Remover Ligação da Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Sincronização em Execução</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<source>The syncing operation is running.<br/>Do you want to terminate it?</source>
<translation>A operação de sincronização está em execução.<br/>Deseja terminá-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 em utilização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 como <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>A versão %1 do servidor é antiga e não é suportada! Prossiga por sua conta e risco.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Ligado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<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="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Terminou a sessão de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Iniciar Sessão</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Existem novas pastas que não foram sincronizadas porque são demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Confirmar Remoção da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Deseja mesmo remover a ligação da conta <i>%1</i>?</p><p><b>Nota:</b> isto <b>não</b> irá eliminar quaisquer ficheiros.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Remover ligação</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Abrir pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Terminar sessão</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Retomar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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> irá eliminar qualquer ficheiro.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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 utilização. Algumas pastas, incluindo a rede montada ou as pastas partilhadas, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 em utilização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Atividade do Servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protocolo de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Lista de ficheiros ignorados ou com erros</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista de atividades para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Não Sincronizado</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Não Sincronizado (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>A lista de atividades do servidor foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>A lista de atividades de sincronização foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>A lista de itens não sincronizados foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Copiado para a área de transferência</translation>
</message>
<translation><br/>A conta %1 não tem atividades ativadas.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Recebeu %n nova notificação de %2.</numerusform><numerusform>Recebeu %n novas notificações de %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Recebeu %n nova notificação de %1 e %2.</numerusform><numerusform>Recebeu %n novas notificações de %1 e %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Recebeu novas notificações de %1, %2 e outras contas.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Notificações - Ação Necessária</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Erro ao gravar os metadados para a base de dados</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation>Abortado pelo utilizador</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 deveria ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 não é legível.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi transferido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>'%1' e %n outro(s) ficheiro(s) foram removidos</numerusform><numerusform>'%1' e %n outros ficheiros foram removidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n outro ficheiro foram transferidos.</numerusform><numerusform>%1 e %n outros ficheiros foram transferidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n outro ficheiro foram actualizados.</numerusform><numerusform>%1 e %n outros ficheiros foram actualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado para %2 e %n outro ficheiro foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros ficheiros foram renomeados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido para %2 e %n outro ficheiro foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros ficheiros foram movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 tem e %n outro ficheiro têm problemas de sincronização.</numerusform><numerusform>%1 tem e %n outros ficheiros têm problemas de sincronização.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 tem um problema de sincronização. Por favor, verifique o ficheiro com conflito!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 e %n outro ficheiro não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform><numerusform>%1 e %n outros ficheiros não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Não foi possível sincronizar %1 devido a um erro. Consulte o registo para detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o ficheiro excluir do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Foi adicionada uma nova pasta maior do que %1 MB: %2.
Por favor, vá às configurações para a selecionar, se a desejar transferir.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Manter ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Esta sincronização iria repor os ficheiros para um momento anterior na pasta de sincronização '%1'.
-Isto pode ser porque um backup foi restaurado no servidor.
-Continuando a sincronização fará com que todos os seus ficheiros sejam substituídos por um ficheiro mais velho num estado anterior. Deseja manter os seus ficheiros locais mais recentes como ficheiros de conflito?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Detetada cópia de segurança</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Ficheiros Locais como Conflito</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Não foi possível reiniciar o estado da pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<source>An old sync journal '%1' was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Foi encontrado um 'journal' de sincronização, mas não foi possível removê-lo. Por favor, certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(cópia de segurança)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(cópia de segurança %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>A aguardar para iniciar a sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>A preparar para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>A sincronização está em execução.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi bem sucedida.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi bem sucedida, mas com avisos nos ficheiros individuais.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Erro de instalação.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Abortado pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>A sincronização está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (A sincronização está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<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="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Não tem permissão para gravar para a pasta selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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 utilizada numa ligação de sincronização da pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 restante, %1 de %2, ficheiro %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>ficheiro %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>A aguardar...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>A preparar para sincronizar...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Nenhum E-Tag recebida do servidor, verifique Proxy / Acesso</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Nós recebemos uma E-Tag diferente para retomar. Tentar da próxima vez.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>O servidor devolveu o alcance-conteúdo errado</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>O tempo de ligação expirou</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Por favor, insira a palavra-passe %1:
-
-Utilizador: %2
-Conta: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>A leitura da cadeia de dados falhou com um erro: '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Insira a Palavra-passe</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>A ligação expirou</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&Correio Eletrónico</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Ligar a %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Insira as credenciais do utilizador</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Ligado com sucesso a %1: %2 - versão: %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Não foi possível ligar a %1 em %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Tempo expirou enquanto tentava ligar a %1 em %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>A tentar ligar a %1 em %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>O pedido de autenticação para o servidor foi redirecionado para '%1'. O URL é mau, o servidor está mal configurado. </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Houve uma resposta inválida para o pedido de autenticação webdav</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Acesso proibido pelo servidor. Para verificar que tem o acesso adequado, <a href="%1">clique aqui</a> para aceder ao serviço com o seu navegador.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>A pasta de sincronização local %1 já existe, a configurar para sincronizar.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>A criar a pasta de sincronização local %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>Falhou.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Não foi possível criar a pasta local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Não foi indicada a pasta remota!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>a criar a pasta na ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Criação da pasta remota %1 com sucesso!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>A pasta remota %1 já existe. Ligue-a para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A criação da pasta resultou num erro HTTP com o código %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.<br/>Por favor, verifique as suas credenciais.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.</font><br/>Por favor, verifique as suas credenciais.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>A criação da pasta remota %1 falhou com o erro <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>A sincronização de %1 com a pasta remota %2 foi criada com sucesso.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Conectado com sucesso a %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Não foi possível ligar a %1 . Por Favor verifique novamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Erro ao renomear a pasta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Não é possível remover e fazer backup à pasta porque a pasta ou um ficheiro nesta está aberto em outro programa. Por favor, feche a pasta ou o ficheiro e clique novamente ou cancele a configuração.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>Assistente de ligação %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Saltar a configuração das pastas</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Erro ao escrever a meta-informação par a base de dados</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Não foi possível transferir o ficheiro %1 devido a um conflito com o nome de ficheiro local!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>A transferência poderá reduzir o espaço livre em disco para abaixo de %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>O Espaço livre no disco é inferior a %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>O ficheiro foi eliminado do servidor</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Não foi possível transferir o ficheiro na totalidade.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>O ficheiro transferido está vazio, apesar do servidor indicar que este deveria ter %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>O ficheiro alterou-se desde a sua descoberta</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Erro ao escrever a meta-informação par a base de dados</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>O ficheiro %1 nao pode ser renomeado para %2 devido a conflito com nome de ficheiro local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Erro ao escrever a meta-informação par a base de dados</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. A alterar para nome original.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor renomeie para o seu nome original: Shared.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O ficheiro foi renomeado mas faz parte de uma partilha só de leitura. O ficheiro original foi restaurado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Código HTTP errado devolvido pelo servidor. Esperado 201, mas foi recebido "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Erro ao escrever a meta-informação par a base de dados</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Ficheiro Eliminado</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Ficheiro local alterado durante a sincronização.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>URL poll em falta</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>O arquivo local foi removido durante a sincronização.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>O servidor não reconheceu a última parte. (Nenhuma e-tag estava presente)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Erro ao escrever a meta-informação par a base de dados</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Caminho OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 Partilhando</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Pasta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>O servidor não permite partilhas</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>A obter do servidor as permissões máximas de partilha...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Copie a &hiperligação</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Permitir edição</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Protegida por senha</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Protegido com Senha</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<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/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Por favor, Definir Senha</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Compartilhe a hiperligação </translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Erro de login</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Sucesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Parametro errado, CSync falhou</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync: Processo de reconciliação falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync: não foi possível autenticar no servidor proxy.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync: não conseguiu contactar o proxy ou o servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<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="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Erro ao ler o ficheiro.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>O ficheiro/pasta foi ignorado porque está oculto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Apenas %1 estão disponíveis, é preciso um mínimo de %2 para começar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync: erro não especificado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Cancelado pelo utilizador</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync falhou o acesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync falhou devido a permissão não tratada negada.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<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="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<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="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>O acesso é proibido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>O nome do ficheiro é muito grande</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Estado falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<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="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Não foi possível ler a lista negra a partir da base de dados local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Não foi possível ler a partir do jornal de sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<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="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro contém pelo menos um caráter inválido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido enviar este ficheiro porque este é só de leitura no servidor, a restaurar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<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="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<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="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>a origem</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versão %1. Para mais informações visite <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuído por %1 e licenciado sob a GNU General Public License (GPL) Versão 2.0.<br/>%2 e o logótipo %2 são marcas registadas da %1 nos Estados Unidos, outros países, ou ambos </p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Por favor inicie a sessão</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Nenhuma pasta de sincronização configurada.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Não há pastas de sincronização configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Iniciar sessão...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Terminar sessão</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Alterações recentes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Procurando por alterações em '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Pastas Geridas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Abrir pasta '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Estado desconhecido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Sair do %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Desconetado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Versão de servidor não suportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>O servidor na conta %1 está a correr uma versão %2 antiga e não suportada. O uso deste cliente com versões de servidor não suportadas não está testado e é potencialmente perigos. Prossiga por sua conta e risco.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Desconetado das contas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>A sincronização de contas está desactivada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Continuar todas as pastas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Pausar todas as pastas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Continuar toda a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Continuar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Pausar toda a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Sair de todas as contas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Entrar em todas as contas...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Crash agora</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Sem itens sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizar %1 de %2 (%3 faltando)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>A sincronizar %1 (%2 em falta)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Atualizado</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>&Iniciar uma nova sincronização (Apaga a pasta local)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Escolher o que sincronizar</translation>
</message>
<translation>Sincronizar tudo do servidor</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Mensagem de estado</translation>
</message>
<translation>Formulário</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>Nome de &utilizador</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Senha</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Error Label</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>TextLabel</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>no futuro</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dia atrás</numerusform><numerusform>%n dias atrás</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n hora atrás</numerusform><numerusform>%n horas atrás</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>agora</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Menos de um minuto atrás</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minuto atrás</numerusform><numerusform>%n minutos atrás</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Algum tempo atrás</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n ano</numerusform><numerusform>%n ano(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n mês</numerusform><numerusform>%n meses</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n horas</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuto</numerusform><numerusform>%n minutos</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n segundo</numerusform><numerusform>%n segundos</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construído a partir da revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p></translation>
</message>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Desconhecido</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>A transferir</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>A enviar</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>a apagar</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>a mover</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorado</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>erro</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>O arquivo de destino tem um tamanho ou tempo de modificação inesperado</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
<translation>Conectado com <server> como <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Adicionar nova</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Remover</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Escolha o que quer sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Remover a conexão de sincronização de pastas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Falha na criação de pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirme a Remoção de Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Remover a Conexão de Sincronização de pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Sincronização Acontecendo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 em uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 como <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>A versão do servidor %1 é antiga e não suportada! Prossiga por conta própria.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<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="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Desconectado de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Entrar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Há novas pastas que não foram sincronizadas, porque eles são muito grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Confirmar a Remoção da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Remover conexão</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Abrir pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Resumir sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 em uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Nenhuma %1 conexão configurada.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Atividade do Servidor</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protocolo de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Lista de arquivos ignorados ou errôneos</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista de atividades para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Não Sincronizado</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Não sincronizada (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>A lista de atividades do servidor tem sido copiados para o clipboard.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>A lista de atividades do servidor foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>A lista de itens não sincronizados foi copiada para a área de transferência.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Copiado para área de transferência</translation>
</message>
<translation><br/>A conta %1 não tem atividades ativadas.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Você recebeu %n nova notificação de %2.</numerusform><numerusform>Você recebeu %n notificações de %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Você recebeu %n nova notificação de %1 e %2.</numerusform><numerusform>Você recebeu %n novas notificações de %1 e %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Você recebeu novas notificações de %1, %2 e outras contas.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Notificações - Ação Requerida</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 deve ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi baixado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 e %n outro arquivo foi removido.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n outro arquivo foi baixado.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n outro arquivo foi atualizado.</numerusform><numerusform>%1 e %n outros arquivos foram atualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado para %2 e %n outro arquivo foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros arquivos foram renomeados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido para %2 e %n outro arquivo foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros arquivos foram movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 tem e %n outro arquivo tem conflito na sincronização.</numerusform><numerusform>%1 tem e %n outros arquivos teem conflito na sincronização.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 tem um conflito na sincronização. Por favor verifique o arquivo de conflito!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 e %n outro arquivo não pode ser sincronizado devido a erros. Veja o log para detalhes.</numerusform><numerusform>%1 e %n outros arquivos não poderam ser sincronizados devido a erros. Veja o log para detalhes.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 não pode ser sincronizado devido a um erro. Veja o log para obter detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Esta sincronização iria repor os arquivos para um instante anterior na pasta de sincronização '%1'.
-Isso pode ser porque um backup foi restaurado no servidor.
-Continuando a sincronização como normal fará com que todos os seus arquivos sejam substituídos por um arquivo mais velho em um estado anterior. Você deseja manter seus locais de arquivos mais recentes como arquivos de conflito?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Arquivos Locais como Conflito</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<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="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation> (backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>À espera do início da sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<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="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Erro de Configuração.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Usuário Abortou.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Nenhuma pasta válida selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 restando, %1 de %2, arquivo %3 de %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>arquivo %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Esperando...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Preparando para sincronizar...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<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/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Conexão Finalizada</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Digite %1 a senha:
-
-Usuário: %2
-Conta: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>Leitura de chaveiro falhou com o erro: '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Entrar Senha</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Conexão expirou</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&Email</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Conectar a %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Entre com as credenciais do usuário</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Conectado com sucesso a %1: %2 versão %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Falha ao conectar a %1 em %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>O tempo expirou ao tentar contactar %1 e %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentando conectar a %1 em %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>A solicitação de autenticação ao servidor foi direcionada para '%1'. A URL está errada, a configuração do servidor está errada.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Houve uma resposta inválida a um pedido de autenticação WebDAV</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Acesso proibido pelo servidor. Para verificar se você tem acesso adequado, <a href="%1">clique aqui</a> para acessar o serviço com o seu navegador.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Pasta local de sincronização %1 já existe, configurando para sincronização. <br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Criação de pasta de sincronização local %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>falhou.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Não foi possível criar pasta local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Nenhuma pasta remota foi especificada!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>criar pasta no ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Pasta remota %1 criada com sucesso.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Pasta remota %1 já existe. Conectando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A criação da pasta resultou em um erro do código HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>A criação da pasta remota falhou porque as credenciais fornecidas estão erradas!<br/>Por favor, volte e verifique suas credenciais.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">A criação remota de pasta falhou provavelmente as causas da falha na criação da pasta remota são credenciais erradas</font><br/>Volte e verifique suas credenciais, por favor.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Falha na criação da pasta remota %1 com erro <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Uma conexão de sincronização de %1 para o diretório remoto %2 foi realizada.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Conectado com sucesso a %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Conexão à %1 não foi estabelecida. Por favor, verifique novamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Falha no nome da pasta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo que está nesta pasta está aberto em outro programa. Por favor, feche a pasta ou arquivo e clique tentar novamente ou cancelar a operação.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Pasta de sincronização local %1 criada com sucesso!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>Assistente de Conexões do %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Pular etapa de configuração de pastas</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>O download reduziá o espaço livre em disco abaixo de %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>O espaço livre no disco é inferior a %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>O arquivo foi eliminado do servidor</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>O arquivo não pode ser baixado completamente.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>O arquivo baixado está vazio apesar do servidor anunciou que deveria ter %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Arquivo foi alterado desde a descoberta</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>O arquivo %1 não pode ser renomeado para %2 por causa de um choque com nome de arquivo local</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Esta pasta não pode ser renomeada. Ela será renomeado de volta ao seu nome original.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Esta pasta não pode ser renomeada. Por favor, nomeie-a de volta para Compartilhada.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>O arquivo foi renomeado mas faz parte de compartilhamento só de leitura. O arquivo original foi restaurado.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Código HTTP retornado errado pelo servidor. 201 esperado, mas recebeu "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Arquivo Removido</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Arquivo local alterado durante a sincronização. Ele será retomado.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Arquivo local modificado durante a sincronização.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Faltando conjunto de URL</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>O arquivo local foi removido durante a sincronização.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>O servidor não reconheceu o último pedaço. (Nenhuma e-tag estava presente)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Caminho ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>Compartilhamento %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Pasta: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>O servidor não permitir o compartilhamento</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Recuperando máximo possível de permissões de compartilhamento do servidor...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Copiar &link</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Permitir edição</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>S&enha de proteção</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Protegido por Senha</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Comp&artilhamento público requer uma senha</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Por favor, Definir senha</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>Link de &Compartilhamento</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Erro de Login</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Sucesso.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync falhou ao reservar memória.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Erro fatal de parametro do CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>Ocorreu uma desconexão de rede. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<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="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<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="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Erro ao ler pasta.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Arquivo/pasta ignorado porque porque está escondido.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Apenas %1 estão disponíveis, precisamos de pelo menos %2 para começar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Erro não especificado no CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Abortado pelo usuário</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync não conseguiu o acesso</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync falhou devido a permissão de não manipulação negada.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<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="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<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="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Acesso proibido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>O nome do arquivo é muito longo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Stat falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<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="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Não é possível ler a lista negra a partir do banco de dados local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Não é possível ler a partir do relatório de sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<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="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>O nome do arquivo contem pelo menos um caractere inválido </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Não é permitido remover, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Não é permitido mover, item restaurado</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>o destino</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>a fonte</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Versão %1. Para mais informações por favor visite <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Direitos autorais ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribuído por %1 e licenciado sobre a GNU General Public License (GPL) Versão 2.0.<br/>%2 e o %2 logo são marcas registradas de %1 nos Estados Unidos, outros países ou ambos.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Favor conectar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Pastas de sincronização não configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Não há pastas de sincronização configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Entrar...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Alterações Recentes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Verificando por alterações em '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Pastas Gerenciadas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Abrir pasta '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Status desconhecido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Sair %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Versão do Servidor Não Suportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>O servidor da conta %1 está executando uma versão %2 antiga e não suportada. Usar esse cliente junto com versões não suportadas e não testadas é potencialmente perigoso. Prossiga por conta própria.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de contas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>A sincronização de conta está desativada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Retomar todas as pastas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Pausar todas as pastas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Retomar toda a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Retomar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Dar uma pausa em toda a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Dar uma pausa na sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Desconectar todas as contas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Conectar todas as contas...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Quebrar agora</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Não há itens sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizar %1 de %2 (%3 faltando)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (%2 faltando)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Até a data</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
- <translation><p>Versão %2. Para mais informações visite <a href="%3">%4</a></p><p><small>Por Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz e outros.</small></p><p>Direitos autorais ownCloud GmbH</p><p>Licenciado sob a GNU General Public License (GPL) Versão 2.0<br/>ownCloud e o logo ownCloud são marcas registradas da ownCloud, Inc. nos Estados Unidos e, em outros países, ou ambos.</p></translation>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Iniciar uma sincronização &limpa (Elimina a pasta local!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Escolha o que quer sincronizar</translation>
</message>
<translation>S&ync tudo do servidor</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Mensagem de status</translation>
</message>
<translation>Formulário</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Nome do Usuário</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Senha</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Rótulo de Erro</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>TextLabel</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>no futuro</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dia(s) atrás</numerusform><numerusform>%n dia(s) atrás</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n hora(s) atrás</numerusform><numerusform>%n hora(s) atrás</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>agora</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>A menos de um minuto atrás</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minuto(s) atrás</numerusform><numerusform>%n minuto(s) atrás</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Algum tempo atrás</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n ano</numerusform><numerusform>%n ano(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n mês</numerusform><numerusform>%n mês(es)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n day</numerusform><numerusform>%n dia(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hora</numerusform><numerusform>%n hora(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuto</numerusform><numerusform>%n minuto(s)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n segundo</numerusform><numerusform>%n segundo(s)</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Construído a partir de revisão Git <a href="%1">%2</a> em %3, %4 usando Qt %5, %6</small></p></translation>
</message>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Desconhecido</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>baixando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>enviando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>eliminando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>movendo</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorando</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>erro</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Конечный файл имеет некорректный размер или время изменения</translation>
</message>
<translation>Неотмеченные каталоги будут <b>удалены</b> из вашей локальной файловой системы и больше не будут синхронизироваться на этом компьютере</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Применить</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
<translation>Подключен к <server> как <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Учётная запись не настроена.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Добавить новый</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Удалить</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Уч.запись</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Выбрать объекты для синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Удалить подключение синхронизации каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Ошибка создания каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Подтвердите удаление подключения синхронизации каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Удалить подключение синхронизации каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Синхронизация запущена</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 используется</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 как <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Сервер версии %1 устарел и не поддерживается! Продолжайте на свой страх и риск.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Соединен с %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сервер %1 временно недоступен.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Успешно вышли из %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation>Нет соединения с %1 в %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Войти</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Есть новые каталоги, которые не были синхронизированы, так как они слишком большие:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Подтверждение удаления учетной записи</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Удалить подключение</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Открыть папку</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Выйти</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Продолжить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Приостановить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 из %2 используется</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Действия Сервера</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Протокол синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Список игнорируемых или ошибочных файлов</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Скопировать журнал синхронизации в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Не синхронизировано</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Не синхронизировано (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Список активности сервера скопирован в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Список активности синхронизации скопирован в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Список несинхронизированных элементов скопирован в буфер обмена.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Скопировано в буфер обмена</translation>
</message>
<translation><br/>У учетной записи %1 не включены события.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Вы получили %n новое уведомление от %2.</numerusform><numerusform>Вы получили %n новых уведомления от %2.</numerusform><numerusform>Вы получили %n новых уведомлений от %2.</numerusform><numerusform>Вы получили %n новых уведомлений от %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Вы получили %n новое уведомление от %1 и %2.</numerusform><numerusform>Вы получили %n новых уведомления от %1 и %2.</numerusform><numerusform>Вы получили %n новых уведомлений от %1 и %2.</numerusform><numerusform>Вы получили %n новых уведомлений от %1 и %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Для Вас получено %n новых уведомлений из %1, %2 и других уч.записей.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 уведомлений - требуются действия.</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Ошибка записи метаданных в базу данных</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation>Прервано пользов</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальный каталог %1 не существует.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 должен быть папкой, но ей не является.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 не может быть прочитан.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>'%1' был удалён</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 был загружен.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 был обновлён.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 был переименован в %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 был перемещён в %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 и ещё %n другой файл был удалён.</numerusform><numerusform>%1 и ещё %n других файла было удалено.</numerusform><numerusform>%1 и ещё %n других файлов были удалены.</numerusform><numerusform>%1 и ещё %n других файлов были удалены.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 и ещё %n другой файл были скачаны.</numerusform><numerusform>%1 и ещё %n других файла были скачаны.</numerusform><numerusform>%1 и ещё %n других файлов были скачаны.</numerusform><numerusform>%1 и ещё %n других файлов были скачаны.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 и ещё %n другой файл были обновлены.</numerusform><numerusform>%1 и ещё %n других файла были обновлены.</numerusform><numerusform>%1 и ещё %n других файлов были обновлены.</numerusform><numerusform>%1 и ещё %n других файлов были обновлены.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 был переименован в %2, и ещё %n другой файл был переименован.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файла были переименованы.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файлов были переименованы.</numerusform><numerusform>%1 был переименован в %2, и ещё %n других файлов были переименованы.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 был перемещён в %2, и ещё %n другой файл был перемещён.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform><numerusform>%1 был перемещён в %2, и ещё %n других файла были перемещены.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>У %1 и ещё у %n другого файла есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform><numerusform>У %1 и ещё у %n других файлов есть конфликты синхронизации.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>У %1 есть конфликт синхронизации. Пожалуйста, проверьте конфликтный файл!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 и ещё %n другой файл не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файла не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файлов не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform><numerusform>%1 и ещё %n других файлов не удалось синхронизировать из-за ошибок. Подробности смотрите в журнале.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 не может быть синхронизирован из-за ошибки. Смотрите детали в журнале.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>Невозможно прочесть системный файл исключений</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Эта синхронизация вернет все файлы в папке '%1' в более ранее состояние.
-Это может быть причиной восстановления резервной копии на сервере.
-Продолжение синхронизации в обычном режиме приведет к тому, что все ваши файлы будут перезаписаны старыми файлами в новом состоянии. Вы желаете оставить ваши локальные файлы как конфликтующие?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Обнаружена резервная копия</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Обычная синхронизация</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Сохранить локальные файлы как конфликтующие</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Невозможно сбросить состояние каталога</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(бэкап)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(бэкап %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Ожидание запуска синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения для некоторых файлов.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Не выбран валидный каталог!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>Выбранный путь не является папкой!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>У вас недостаточно прав для записи в выбранный каталог!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>Осталось %5, %1 из %2, файл %3 из %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>файл %1 из %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Ожидание...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Подготовка к синхронизации...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>E-Tag от сервера не получен, проверьте настройки прокси/шлюза.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Мы получили другой E-Tag для возобновления. Повторите попытку позже.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Сервер вернул неверный диапазон содержимого</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Время ожидания подключения истекло</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Пожалуйста, введите %1 пароль:
-
-Пользователь: %2
-Учетная запись: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>Чтение из брелока завершилось с ошибкой: '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Введите пароль</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Время ожидания соединения превышено</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&Почта</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Подключиться к %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Ввести учётные данные</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Успешное подключение к %1: %2 версия %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Не удалось подключиться к %1 в %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Превышено время ожидания соединения к %1 на %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Попытка соединиться с %1 на %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Запрос авторизации с сервера перенаправлен на '%1'. Ссылка не верна, сервер не настроен.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Обнаружен не верный ответ на авторизованный запрос WebDAV</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Доступ запрещён сервером. Чтобы доказать, что у Вас есть права доступа, <a href="%1">нажмите здесь</a> для входа через Ваш браузер.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Локальный каталог синхронизации %1 уже существует, используем его для синхронизации.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Создание локальной папки синхронизации %1... </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ок</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>не удалось.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Не удалось создать локальный каталог синхронизации %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Не указан удалённый каталог!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Ошибка: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>создание каталога на ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Удалённый каталог %1 успешно создан.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Удалённый каталог %1 уже существует. Подключение к нему для синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Создание каталога завершилось с HTTP-ошибкой %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Не удалось создать удаленный каталог, так как представленные параметры доступа неверны!<br/>Пожалуйста, вернитесь назад и проверьте учетные данные.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Не удалось создать удаленный каталог, возможно, указанные учетные данные неверны.</font><br/>Вернитесь назад и проверьте учетные данные.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Удаленный каталог %1 не создан из-за ошибки <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Установлено соединение синхронизации %1 к удалённому каталогу %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Соединение с %1 установлено успешно!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Не удалось соединиться с %1. Попробуйте снова.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Ошибка переименования каталога</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Невозможно удалить каталог и создать его резервную копию, каталог или файл в ней открыт в другой программе. Закройте каталог или файл и нажмите "Повторить попытку", либо прервите мастер настройки.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Локальный каталог синхронизации %1 успешно создан!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>Мастер подключения %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Пропустить настройку каталогов</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Ошибка записи метаданных в базу данных</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Файл %1 не может быть загружен из-за локального конфликта имен!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Эта загрузка уменьшит свободное дисковое пространство ниже %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Свободное место на диске меньше, чем %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Файл был удален с сервера</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Невозможно полностью загрузить файл.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>Скачанный файл пуст, хотя сервер заявил, что он должен быть %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
- <translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>После обнаружения файл был изменен</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Ошибка записи метаданных в базу данных</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Файл %1 не может быть переименован в %2 из-за локального конфликта имен</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Ошибка записи метаданных в базу данных</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Этот каталог не должен переименовываться. Ему будет присвоено изначальное имя. </translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Этот каталог не должен переименовываться. Присвойте ему изначальное имя: Shared. </translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Файл переименован на удаленном общем ресурсе только для чтения. Файл был восстановлен.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Ошибка записи метаданных в базу данных</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Файл Перемещён</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Локальный файл изменился в процессе синхронизации. Операция будет возобновлена.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Локальный файл изменился в процессе синхронизации.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation>Принудительная остановка задачи при сбросе HTTP подключения для Qt < 5.4.2.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Не хватает сформированного URL</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Локальный файл был удалён в процессе синхронизации.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Сервер не смог подтвердить последнюю часть данных.(Отсутствовали теги e-tag)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Ошибка записи метаданных в базу данных</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Путь к OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>Вы поделились %1 </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Папка: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Сервер не разрешает обмен</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Запрос максимально возможных прав для предоставления доступа с сервера…</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Невозможно предоставить общий доступ к файлу: нет разрешения на предоставление общего доступа.</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Копировать &ссылку</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Разрешить редактирование</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Защитить паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Защищено Паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Невозможно предоставить общий доступ к файлу: нет разрешения на предоставление общего доступа.</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Публичные ссылки требуют пароля</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Пожалуйста, установите пароль</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>Поделиться ссылкой</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Ошибка входа</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Успешно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync получил сообщение об ошибке при обработке внутренних деревьев.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не удалось зарезервировать память.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Критическая ошибка параметра CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>Процесс обновления CSync не удался.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>Процесс согласования CSync не удался.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не удалось авторизоваться на прокси сервере.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не удалось найти прокси сервер.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не удалось авторизоваться на сервере %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не удалось подключиться к сети.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>Вышло время ожидания подключения к сети.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>Произошла ошибка передачи HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Смонтированная папка временно недоступна на сервере</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>Произошла ошибка во время открытия папки</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Произошла ошибка во время чтения папки.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Файл/папка проигнорированы, так как являются скрытыми.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Только %1 доступно, нужно как минимум %2 чтобы начать</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: Нет свободного пространства на сервере %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Неизвестная ошибка CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Прервано пользователем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Файл содержит недопустимые символы, которые невозможно синхронизировать между платформами.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync отказано в доступе</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync не выполнен из-за отказа в доступе для необработанного разрешения.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync попытался создать папку, которая уже существует.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Сервис временно недоступен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Доступ запрещен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>Произошла внутренняя ошибка номер %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Элемент не синхронизируется из-за произошедших ошибок: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронизация символических ссылок не поддерживается.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Имя файла слишком длинное.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Не удалось загрузить статистику.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Кодировка имени файла не верна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Недопустимые символы, пожалуйста, переименуйте "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation>Невозможно инициализировать журнал синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Не удалось прочитать файл чёрного списка из локальной базы данных.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Не удалось прочитать из журнала синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Не удаётся открыть журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Имя файла содержит по крайней мере один некорректный символ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Игнорируется из-за черного списка в "что синхронизировать"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Не допускается удаление, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>Локальные файлы и общий каталог удалены.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Перемещение не допускается, элемент восстановлен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Перемещение не допускается, поскольку %1 помечен только для чтения</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>назначение</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>источник</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Версия %1. Для получения дополнительной информации посетите <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Все права принадлежат ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Распространяется %1 и лицензировано под GNU General Public License (GPL) Версии 2.0.<br/>Логотипы %2 и %2 являются зарегистрированной торговой маркой %1 в США и/или других странах.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Пожалуйста войдите в систему</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Каталог %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Нет каталогов для синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Нет настроенных каталогов для синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Открыть в браузере</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Вход...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Выйти</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Недавние изменения</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Проверка изменений в '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Управляемые каталоги:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Открыть каталог '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Открыть %1 в браузере</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Неизвестный статус</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Настройки...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Детали...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Помощь</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Закрыть %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Отключен от %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Версия сервера не поддерживается</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Сервер для учетной записи %1 использует старую не поддерживаемую версию %2. Использование этого клиента совместно с не поддерживаемым сервером не тестировалось и является потенциально небезопасным. Вы продолжаете на свой страх и риск.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Отключен от учетных записей:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Учетная запись %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Синхронизация учётной записи отключена</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Снять с паузы все папки</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Поставить на паузу все папки</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Возобновить все синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Возобновить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Приостановить все синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Приостановить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Выйти из всех учетных записей</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Войти во все учетные записи...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Критическая ошибка!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Недавно ничего не синхронизировалось</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Синхронизация %1 из %2 (осталось %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Синхронизация %1 (осталось %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Актуальная версия</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
- <translation><p>Версия %2. Дополнительная информация доступна по ссылке <a href="%3">%4</a></p><p><small>Авторы: Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz, и другие.</small></p><p>Авторские права принадлежат ownCloud GmbH</p><p>Лицензировано под GNU General Public License (GPL) Версии 2.0<br/>ownCloud и логотип ownCloud - зарегистрированные торговые марки ownCloud, Inc. в Соединенных Штатах, и/или других странах</p></translation>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>TextLabel</translation>
</message>
<translation>Начать новую синхронизацию (Стирает локальную папку!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Уточнить объекты</translation>
</message>
<translation>Синхронизировать всё с сервером</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Сообщение о состоянии</translation>
</message>
<translation>Форма</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Имя пользователя</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Пароль</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Ярлык Ошибки</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>TextLabel</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>в будущем</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n день назад</numerusform><numerusform>%n дня назад</numerusform><numerusform>%n дней назад</numerusform><numerusform>%n дней назад</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n час назад</numerusform><numerusform>%n часа назад</numerusform><numerusform>%n часов назад</numerusform><numerusform>%n часов назад</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>сейчас</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Меньше минуты назад</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n минута назад</numerusform><numerusform>%n минуты назад</numerusform><numerusform>%n минут назад</numerusform><numerusform>%n минут назад</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Некоторое время назад</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 ГБ</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 МБ</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 КБ</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 Б</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n год</numerusform><numerusform>%n года</numerusform><numerusform>%n лет</numerusform><numerusform>%n лет</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n месяц</numerusform><numerusform>%n месяца</numerusform><numerusform>%3 месяцев</numerusform><numerusform>%n месяцев</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n день</numerusform><numerusform>%n дня</numerusform><numerusform>%n дней</numerusform><numerusform>%n дней</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n час</numerusform><numerusform>%n часа</numerusform><numerusform>%n часов</numerusform><numerusform>%n часов</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n минута</numerusform><numerusform>%n минуты</numerusform><numerusform>%n минут</numerusform><numerusform>%n минут</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n секунда</numerusform><numerusform>%n секунды</numerusform><numerusform>%n секунд</numerusform><numerusform>%n секунд</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Собрано исходников Git версии <a href="%1">%2</a> на %3, %4 используя Qt %5, %6</small></p></translation>
</message>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Неизвестно</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>скачивание</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>загрузка</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>удаление</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>перемещение</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>игнорирование</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>ошибка</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Cieľový súbor má neočakávanú veľkosť alebo čas zmeny</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Aplikovať</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Zrušiť</translation>
</message>
<translation>Spojené z <server> ako <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Žiadny účet nie je nastavený.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Pridať nový účet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Odobrať</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Účet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Vybrať čo synchronizovať</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Odstrániť prepojenie priečinka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Vytvorenie priečinka zlyhalo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potvrdiť odstránenie prepojenia priečinka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstrániť prepojenie priečinka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Prebiehajúca synchronizácia</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 sa používa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 ako <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Verzia servera %1 je stará a nepodporovaná. Pokračujte na vlastné nebezpečenstvo.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Pripojené k %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 je dočasne nedostupný.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Odhlásený z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Prihlásiť sa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Niektoré nové priečinky neboli synchronizované, pretože sú priveľké:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Potvrďte ostránenie účtu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Naozaj chcete odstrániť pripojenie k účtu <i>%1</i>?</p><p><b>Poznámka:</b> Tým sa <b>nevymažú</b> žiadne súbory.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Vymazať pripojenie</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Otvoriť priečinok</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Odhlásiť</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Obnoviť synchronizáciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Pozastaviť synchronizáciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<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="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Aktivita servera</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Záznam synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Zoznam ignorovaných alebo chybných súborov</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopírovať</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Skopírovať zoznam aktivít do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Nezosynchronizované</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Nezosynchronizované (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Zoznam aktivít servera bol skopírovaný do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Zoznam aktivít synchronizácie bol skopírovaný do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Zoznam nesynchronizovaných položiek bol skopírovaný do schránky.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Skopírované do schránky</translation>
</message>
<translation><br/>Účet %1 nemá zapnuté aktivity.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Chyba pri zápise metadát do databázy</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokálny priečinok %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 by mal byť priečinok, avšak nie je.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol zmazaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol stiahnutý.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol aktualizovaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 bol premenovaný na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 bol presunutý do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nemôže byť synchronizovaný kvôli chybe. Pozrite sa do logu pre podrobnosti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Táto synchronizácia by vrátila súbory v synchronizačnom priečinku „%1“ na starší čas.
-To sa môže stať v prípade, že na vašom serveri bola obnovená záloha.
-Ak by ste normálne pokračovali v synchronizácii, skôzobilo by to prepísanie všetkých vašich súborov ich staršou verziou. Chcete zachovať vaše lokálne, najnovšie súbory ako konfliktné súbory?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Záloha je dostupná</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Bežná synchronizácia</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Ponechať lokálne súbory ako konfliktné</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Nemožno resetovať stav priečinka</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation> (záloha)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation> (záloha %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Čaká sa na začiatok synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<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="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Zrušené používateľom.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia je pozastavená)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Nebol zvolený platný priečinok.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<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="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>súbor %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Čakajte...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Príprava na synchronizáciu...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Server vrátil nesprávnu hodnotu Content-range</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Spojenie vypršalo</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Vložte heslo</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Pripojenie expirovalo</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Pripojiť sa k %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Vložte prihlasovacie údaje</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Úspešne pripojené k %1: %2 verzie %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Zlyhalo spojenie s %1 o %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Časový limit vypršal pri pokuse o pripojenie k %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Pokúšam sa o pripojenie k %1 na %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Overená požiadavka na server bola presmerovaná na '%1'. URL je zlá, server nie je správne nakonfigurovaný.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Neplatná odpoveď na overenú webdav požiadavku</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Prístup zamietnutý serverom. Po overení správnych prístupových práv, <a href="%1">kliknite sem</a> a otvorte službu v svojom prezerači.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokálny synchronizačný priečinok %1 už existuje, prebieha jeho nastavovanie pre synchronizáciu.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Vytváranie lokálneho synchronizačného priečinka %1 ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>v poriadku</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>neúspešné.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Nemožno vytvoriť lokálny priečinok %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Vzdialený priečinok nie je nastavený!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Chyba: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>vytváram priečinok v ownCloude: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Vzdialený priečinok %1 bol úspešne vytvorený.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Vzdialený priečinok %1 už existuje. Prebieha jeho pripájanie pre synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Vytváranie priečinka skončilo s HTTP chybovým kódom %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Proces vytvárania vzdialeného priečinka zlyhal, lebo použité prihlasovacie údaje nie sú správne!<br/>Prosím skontrolujte si vaše údaje a skúste to znovu.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Vytvorenie vzdialeného priečinka pravdepodobne zlyhalo kvôli nesprávnym prihlasovacím údajom.</font><br/>Prosím choďte späť a skontrolujte ich.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Vytvorenie vzdialeného priečinka %1 zlyhalo s chybou <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Synchronizačné spojenie z %1 do vzdialeného priečinka %2 bolo práve nastavené.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Úspešne pripojené s %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Pripojenie k %1 nemohlo byť iniciované. Prosím skontrolujte to znovu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Premenovanie priečinka zlyhalo</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Nemožno odstrániť a zazálohovať priečinok, pretože priečinok alebo súbor je otvorený v inom programe. Prosím zatvorte priečinok nebo súbor a skúste to znovu alebo zrušte akciu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokálny synchronizačný priečinok %1 bol úspešne vytvorený!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Asistent pripojenia</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Preskočiť konfiguráciu priečinkov</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Chyba pri zápise metadát do databázy</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Súbor bol vymazaný zo servera</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Súbor sa nedá stiahnuť úplne.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Súbor sa medzitým zmenil</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Chyba pri zápise metadát do databázy</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Súbor %1 nemôže byť premenovaný na %2 z dôvodu, že tento názov je už použitý</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Chyba pri zápise metadát do databázy</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu pôvodné meno.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Tento priečinok nemôže byť premenovaný. Prosím, vráťte mu meno Shared.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Súbor bol premenovaný, ale je súčasťou zdieľania len na čítanie. Pôvodný súbor bol obnovený.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Server vrátil neplatný HTTP kód. Očakávaný bol 201, ale vrátený bol "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Chyba pri zápise metadát do databázy</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Súbor zmazaný</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Lokálny súbor bol zmenený počas synchronizácie.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Chýba URL adresa</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Lokálny súbor bol odstránený počas synchronizácie.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Chyba pri zápise metadát do databázy</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>ownCloud cesta:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 zdieľanie</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Priečinok: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Skopírovať &odkaz</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Povoliť úpravy</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>Ch&rániť heslom</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Chránené heslom</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Verejné z&dieľanie vyžaduje heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Prosím nastavte si heslo</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Zdieľať odkaz</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Chybné prihlásenie</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Úspech.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync sa nepodarilo zarezervovať pamäť.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync kritická chyba parametrov.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync sa nepodarilo spracovať krok zladenia.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>Chyba HTTP prenosu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>Nastala chyba počas otvárania priečinka</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Chyba pri čítaní adresára</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync nešpecifikovaná chyba.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Zrušené používateľom</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>Prístup pre CSync zlyhal</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Služba je dočasne nedostupná</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Prístup odmietnutý</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Meno súboru je veľmi dlhé.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<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="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Neplatné znaky, premenujte prosím "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Nemožno čítať zo synchronizačného žurnálu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Nemožno otvoriť sync žurnál</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Názov súboru obsahuje nevhodný znak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Nie je dovolené, lebo nemáte oprávnenie pridávať podpriečinky do tohto priečinka</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<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="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<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="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>cieľ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>zdroj</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Verzia %1. Pre viac informácií choďte na <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Šíri %1 pod licenciou GNU General Public License (GPL) Verzia 2.0.<br/>%2 a %2 logo sú registrované známky %1 v USA, ostatných krajinách, alebo oboje.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Prihláste sa prosím</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Priečinok %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Nie sú nastavené žiadne synchronizačné priečinky.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Nie sú nastavené žiadne priečinky na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Otvoriť v prehliadači</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Prihlásiť sa...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Odhlásiť</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Nedávne zmeny</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Kontrolujú sa zmeny v „%1“</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Spravované priečinky:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Otvoriť priečinok '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Otvoriť %1 v prehliadači</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Neznámy stav</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Nastavenia...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Podrobnosti...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Ukončiť %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Odpojený od %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Nepodporovaná verzia servera</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Odpojené od účtov:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Účet %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Synchronizácia účtu je vypnutá</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Zrušiť pozastavenie všetkých priečinkov</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Pozastaviť všetky priečinky</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Zrušiť pozastavenie všetkej synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Zrušiť pozastavenie synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Pozastaviť všetku synchronizáciu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Pozastaviť synchronizáciu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Odhlásiť sa zo všetkých účtov</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Prihlásiť sa do všetkých účtov...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Zlyhanie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Žiadne nedávno synchronizované položky</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronizuje sa %1 z %2 (zostáva %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronizuje sa %1 (zostáva %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Až do dnešného dňa</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Štítok</translation>
</message>
<translation>Spustiť novú synchronizáciu (Vymaže obsah lokálneho priečinka!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Vybrať čo synchronizovať</translation>
</message>
<translation>S&ynchronizovať zo servera všetko</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Správa o stave</translation>
</message>
<translation>Formulár</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Používateľské meno</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Heslo</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Chybová značka</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Štítok</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>v budúcnosti</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>pred %n dňom</numerusform><numerusform>pred %n dňami</numerusform><numerusform>pred %n dňami</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>pred %n hodinou</numerusform><numerusform>pred %n hodinami</numerusform><numerusform>pred %n hodinami</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>teraz</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Menej ako pred minútou</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>pred %n minútou</numerusform><numerusform>pred %n minútami</numerusform><numerusform>pred %n minútami</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Pred istým časom</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n rok</numerusform><numerusform>%n roky</numerusform><numerusform>%n rokov</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n mesiac</numerusform><numerusform>%n mesiace</numerusform><numerusform>%n mesiacov</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n deň</numerusform><numerusform>%n dni</numerusform><numerusform>%n dní</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n hodina</numerusform><numerusform>%n hodiny</numerusform><numerusform>%n hodín</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minúta</numerusform><numerusform>%n minúty</numerusform><numerusform>%n minút</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundy</numerusform><numerusform>%n sekúnd</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Zostavené z Git revízie <a href="%1">%2</a> na %3, %4 s použitím Qt %5, %6</small></p></translation>
</message>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Neznámy</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>sťahujem</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>nahrávam</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>vymazávanie</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>presúvanie</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorujem</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>chyba</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Ciljna datoteka ima nepričakovano velikost oziroma čas zadnje spremembe.</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Uveljavi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<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="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Ni nastavljenega računa.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Dodaj novo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Odstrani</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Račun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Izbor predmetov za usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Odstrani povezavo mape usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Ustvarjanje mape je spodletelo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Ni mogoče ustvariti krajevne mape <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potrdi odstranjevanje povezave usklajevanja mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstrani povezavo usklajevanja mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Usklajevanje je v teku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 v uporabi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 kot <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Različica strežnika %1 je zastarela in ni več podprta! Nadaljujete na lastno odgovornost.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Povezano z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Strežnik %1 trenutno ni dosegljiv.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Uspešno odjavljeno iz %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation>Ni povezave z %1 pri %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Prijava</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Zaznane so mape, ki zaradi velikosti niso bile usklajene: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Potrdi odstranitev računa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Ali res želite odstraniti povezavo z računom <i>%1</i>?</p><p><b>Opomba:</b> S tem <b>ne bo</b> izbrisana nobena datoteka.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Odstrani povezavo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Odpri mapo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Odjava</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Nadaljuj z usklajevanjem</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Premor usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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>Ali res želite zaustaviti usklajevanje mape <i>%1</i>?</p><p><b>Opomba:</b> s tem datoteke iz odjemalca <b>ne bodo</b> odstranjene.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) od %2 v uporabi. Nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 od %2 v uporabi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljene povezave %1.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Dejavnost strežnika</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Protokol usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Seznam prezrtih datotek ali datotek z napako</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiraj seznam opravil v odložišče.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Ni usklajeno</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Ni usklajeno (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Seznam opravil strežnika je kopiran v odložišče.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Seznam opravil usklajevanja je kopiran v odložišče.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Seznam neusklajenih predmetov je kopiran v odložišče.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Kopirano v odložišče</translation>
</message>
<translation><br/>Za račun %1 možnosti opravil niso omogočene.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Prejeli ste %n novo obvestilo od %2.</numerusform><numerusform>Prejeli ste %n novi obvestili od %2.</numerusform><numerusform>Prejeli ste %n nova obvestila od %2.</numerusform><numerusform>Prejeli ste %n novih obvestil od %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Prejeli ste %n novo obvestilo od %1 in %2.</numerusform><numerusform>Prejeli ste %n novi obvestili od %1 in %2.</numerusform><numerusform>Prejeli ste %n nova obvestila od %1 in %2.</numerusform><numerusform>Prejeli ste %n novih obvestil od %1 in %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Prejeli ste nova obvestila prek %1, %2 in drugih računov.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 obvestil ‒ zahtevajo odziv</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Krajevna mapa %1 ne obstaja.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 bi morala biti mapa, pa ni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je odstranjena.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je prejeta.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je posodobljena.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Datoteka %1 je preimenovana v %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>Datoteka %1 je premaknjena v %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>Datoteka %1 in še %n druga datoteka je bila izbrisana.</numerusform><numerusform>Datoteka %1 in še %n drugi datoteki sta bili izbrisani.</numerusform><numerusform>Datoteka %1 in še %n druge datoteke so bile izbrisane.</numerusform><numerusform>Datoteka %1 in še %n drugih datotek je bilo izbrisanih.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>Datoteka %1 in še %n druga datoteka je bila shranjena na disk.</numerusform><numerusform>Datoteka %1 in še %n drugi datoteki sta bili shranjeni na disk.</numerusform><numerusform>Datoteka %1 in še %n druge datoteke so bile shranjene na disk.</numerusform><numerusform>Datoteka %1 in še %n drugih datotek je bilo shranjenih na disk.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>Datoteka %1 in še %n druga datoteka je bila posodobljena.</numerusform><numerusform>Datoteka %1 in še %n drugi datoteki sta bili posodobljeni.</numerusform><numerusform>Datoteka %1 in še %n druge datoteke so bile posodobljene.</numerusform><numerusform>Datoteka %1 in še %n drugih datotek je bilo posodobljenih.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n druga datoteka je bila preimenovana.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n drugi datoteki sta bili preimenovani.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n druge datoteke so bile preimenovane.</numerusform><numerusform>Datoteka %1 je bila preimenovana v %2 in še %n drugih datotek je bilo preimenovanih.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n druga datoteka je bila premaknjena.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n drugi datoteki sta bili premaknjeni.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n druge datoteke so bile premaknjene.</numerusform><numerusform>Datoteka %1 je bila premaknjena v %2 in še %n drugih datotek je bilo premaknjenih.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>Pri datoteki %1 in še %n drugi datoteki je zaznan spor usklajevanja.</numerusform><numerusform>Pri datoteki %1 in še %n drugih datotekah je zaznan spor usklajevanja.</numerusform><numerusform>Pri datoteki %1 in še %n drugih datotekah je zaznan spor usklajevanja.</numerusform><numerusform>Pri datoteki %1 in še %n drugih datotekah je zaznan spor usklajevanja.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>Pri datoteki %1 je zaznan spor usklajevanja. Preverite datoteko!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>Datoteke %1 in še %n druge datoteke ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform><numerusform>Datoteke %1 in še %n drugih datotek ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform><numerusform>Datoteke %1 in še %n drugih datotek ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform><numerusform>Datoteke %1 in še %n drugih datotek ni mogoče uskladiti zaradi napak. Podrobnosti so zapisane v dnevniški datoteki.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Datoteke %1 zaradi napake ni mogoče uskladiti. Več podrobnosti je zabeleženih v dnevniški datoteki.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Dodana je nova mapa, ki presega %1 MB: %2.
Med nastavitvami jo lahko izberete in označite za prejem.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Ali ste prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Z usklajevanjem bi se datoteke povrnile na predhodni čas usklajevanja mape '%1'.
-To se lahko zgodi, če je na strežniku na primer obnovljena varnostna kopija.
-Z nadaljevanjem usklajevanja bodo vse trenutne datoteke prepisane s starejšimi različicami. Ali želite ohraniti trenutne krajevne datoteke kot preimenovane datoteke v usklajevalnem sporu?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Varnostna kopija je zaznana</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Običajno usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Ohrani krajevne datoteke kot datoteke v sporu</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Ni mogoče ponastaviti stanja mape</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(varnostna kopija)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(varnostna kopija %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Čakanje začetek usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<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="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Ni izbrane veljavne mape!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>Izbrana pot ni mapa!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Krajevna mapa %1 je že v določena za usklajevanje. Izbrati je treba drugo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Krajevna mapa %1 že vključuje mapo, ki je določena za usklajevanje. Izbrati je treba drugo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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>Krajevna mapa %1 je simbolna povezava. Cilj povezave že vsebuje mapo, ki je uporabljena pri povezavi usklajevanja mape. Izberite drugo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Krajevna mapa %1 je že v določena za usklajevanje. Izbrati je treba drugo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>Krajevna mapa %1 je simbolna povezava. Cilj povezave že vsebuje mapo, ki je uporabljena pri povezavi usklajevanja mape. Izberite drugo.</translation>
</message>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>Preostalo še %5, %1 od %2, datoteka %3 od %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>datoteka %1 od %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Čakanje na povezavo ...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>V pripravi je %n druga map ...</numerusform><numerusform>V pripravi sta %n drugi mapi ...</numerusform><numerusform>V pripravi so %n druge mape ...</numerusform><numerusform>V pripravi je %n drugih map ...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Priprava na usklajevanje ...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Odziv strežnika kaže na neveljaven obseg vsebine</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Povezava je časovno potekla</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Vpisati je treba geslo:
-
-Uporabnik: %2
-Račun: %3</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>Branje iz ključa je spodletelo z napako: '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Vnos gesla</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Povezava je potekla</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&Elektronski naslov</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Vzpostavi povezavo s strežnikom %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Vpiši uporabniška poverila</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Uspešno vzpostavljena povezava z %1: %2 različica %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Povezava z %1 pri %2 je spodletela:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Prekinitev med poskusom povezave na %1 pri %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Poteka poskus povezave z %1 na %2 ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Zahteva za overitev s strežnikom je bila preusmerjena na '%1'. Naslov URL ni veljaven ali pa strežnik ni ustrezno nastavljen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Prejet je neveljaven odziv na zahtevo overitve webdav</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Strežnik ne dovoli dostopa. Če želite preveriti, ali imate ustrezen dostop, <a href="%1">kliknite tu</a> za dostop do te storitve z brskalnikom.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Krajevna mapa %1 že obstaja. Nastavljena bo za usklajevanje.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Ustvarjanje mape za krajevno usklajevanje %1 ... </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>je v redu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>je spodletelo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Krajevne mape %1 ni mogoče ustvariti.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Ni navedenega oddaljenega strežnika!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Napaka: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>ustvarjanje mape v oblaku ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Oddaljena mapa %1 je uspešno ustvarjena.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Oddaljena mapa %1 že obstaja. Vzpostavljena bo povezava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Ustvarjanje mape je povzročilo napako HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Ustvarjanje mape na oddaljenem naslovu je spodletelo zaradi napačnih poveril. <br/>Vrnite se in preverite zahtevana gesla.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Ustvarjanje oddaljene mape je spodletelo. Najverjetneje je vzrok v neustreznih poverilih.</font><br/>Vrnite se na predhodno stran in jih preverite.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Ustvarjanje oddaljene mape %1 je spodletelo z napako <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Povezava za usklajevanje med %1 in oddaljeno mapo %2 je vzpostavljena.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Povezava z %1 je uspešno vzpostavljena!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Povezave z %1 ni mogoče vzpostaviti. Preveriti je treba nastavitve.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Preimenovanje mape je spodletelo</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, saj je mapa oziroma dokument v njej odprt z drugim programom. Zaprite mapo/dokument ali prekinite namestitev.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Krajevno usklajena mapa %1 je uspešno ustvarjena!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>Čarovnik za povezavo %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Preskoči nastavitve map</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Prejem bi zmanjšal prostor na disku pod %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Prostor na disku je manjši od %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Datoteka je izbrisana s strežnika</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Datoteke ni mogoče v celoti prejeti.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>Prejeta datoteka je prazna, čeprav je na strežniku objavljena z %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Datoteka je bila po spremenjena po usklajevanju seznama datotek.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Datoteke %1 ni mogoče preimenovati v %2 zaradi že obstoječe datoteke s tem imenom.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Te mape ni dovoljeno preimenovati, zato bo samodejno preimenovana v izvorno ime.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Te mape ni dovoljeno preimenovati. Preimenujte jo nazaj na privzeto vrednost.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Datoteka je preimenovana, vendar je označena za souporabo le za branje. Obnovljena je izvirna datoteka.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>S strežnika je vrnjen neveljaven odziv HTTP. Pričakovan je 201, prejet pa je bil "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Datoteka je odstranjena</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Krajevna datoteka je bila med usklajevanjem spremenjena.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation>Vsiljevanje prekinitve posla na prekinitvi povezave HTTP s Qt < 5.4.2.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>URL za branje manjka</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Krajevna datoteka je bila med usklajevanjem odstranjena.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Strežnik ne sprejme zadnjega paketa (ni navedene e-oznake)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Pot do OwnCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 souporaba datotek</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Mapa: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Strežnik ne podpira souporabe</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Pridobivanje največjega mogočega števila dovoljenj za souporabo prek strežnika ...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Datoteke ni mogoče dodeliti v souporabo, ker ni navedenih ustreznih dovoljenj.</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>&Kopiraj povezavo</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Dovoli urejanje</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>&Zaščiti z geslom</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Zaščiteno z geslom</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Datoteke ni mogoče dodeliti v souporabo, ker je ni navedenih ustreznih dovoljenj.</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Javna omogočanje &souporabe zahteva geslo</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Določite geslo</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>Povezava za &souporabo</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Napaka prijave</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Uspešno končano.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>Nalaganje dnevniške datoteke s CSync je spodletelo. Dnevniška datoteka je okvarjena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<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="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>Usodna napaka parametra CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>Korak opravila posodobitve CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>Korak opravila poravnave CSync je spodletel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>Omrežna povezava je časovno potekla.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Priklopljena mapa trenutno ni na voljo na strežniku</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>Med odpiranjem mape je prišlo do napake.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Napaka med branjem mape</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Datoteka/Mapa je prezrta, ker je skrita.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Le %1 je na voljo, zahtevanih pa je vaj %2 za zagon</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje starševske mape</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Nedoločena napaka CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Opravilo je bilo prekinjeno s strani uporabnika</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Ime datoteke vsebuje neveljavne znake, ki jih ni mogoče uskladiti na vseh okoljih.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>Dostop s CSync je spodletel</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>Nalaganje ali ustvarjanje dnevniške datoteke s CSync je spodletelo. Za to opravilo so zahtevana dovoljenja branja in zapisovanja krajevne mape za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>Delovanje CSync je zaradi nerazrešenih dovoljenj spodletelo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>Ustvarjanje mape s CSync je spodletelo. Mapa že obstaja.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Storitev trenutno ni na voljo</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Dostop je prepovedan.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Ime datoteke je predolgo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Določanje statističnih podatkov je spodletelo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Kodni zapis imena datoteke ni veljaven.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Uporabljen je neveljaven znak; preimenujte "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Ni mogoče prebrati črnega seznama iz krajevne mape</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Ni mogoče brati iz dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Ime datoteke vsebuje vsaj en neveljaven znak.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Prezrto, ker je predmet označen na črni listi za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Dejanje ni dovoljeno! Ni ustreznih dovoljenj za dodajanje podmap v to mapo.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranitev ni dovoljena, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Premikanje ni dovoljeno, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>cilj</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>vir</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Različica %1. Za več podrobnosti si oglejte <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation><p>Avtorske pravice ownCloud, GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Programski paket objavlja %1 pod pogoji Splošnega javnega dovoljenja GNU (GNU General Public License - GPL), različice 2.0.<br>%2 in logotip %2 sta blagovni znamki %1 v Združenih državah, drugih državah ali oboje.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Pred nadaljevanjem je zahtevana prijava</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Mapa %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Ni nastavljenih map za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Ni nastavljenih map za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Odpri v brskalniku</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Prijava ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Odjava</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Nedavne spremembe</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Preverjanje za spremembe v '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Upravljane mape:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Odpri mapo '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Odpri %1 v brskalniku</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Neznano stanje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Nastavitve ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Podrobnosti ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Pomoč</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Končaj %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Prekinjena povezava z %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Nepodprta različica strežnika</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Na strežniku računua %1 teče starejša nepodprta različica %2. Z uporabo trenutno nameščenega odjemalca z nepodporo različico strežnika ni varno. Nadaljujete na lastno odgovornost.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Prekinjena je povezava z računi:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Račun %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Usklajevanje računa je onemogočeno</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Nadaljuj usklajevanje vseh map</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Ustavi usklajevanje vseh map</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Nadaljuj usklajevanje vsega</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Nadaljuj usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Ustavi vse usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Ustavi usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Odjavi vse račune</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Prijavi z vsemi računi ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Sesuj zdaj</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Ni nedavno usklajenih predmetov</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Poteka usklajevanje %1 od %2 (preostaja %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Usklajevanje %1 (%2 do konca)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Ni posodobitev</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Besedilna oznaka</translation>
</message>
<translation>Začni s &svežim usklajevanjem (izbriše krajevno mapo!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Izbor datotek za usklajevanje</translation>
</message>
<translation>Uskladi &vse datoteke s strežnika</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Sporočilo stanja</translation>
</message>
<translation>Obrazec</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Uporabniško ime</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Geslo</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Oznaka napake</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Besedilna oznaka</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>v prihodnje</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>pred %n dnevom</numerusform><numerusform>pred %n dnevoma</numerusform><numerusform>pred %n dnevi</numerusform><numerusform>pred %n dnevi</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>pred %n uro</numerusform><numerusform>pred %n urama</numerusform><numerusform>pred %n urami</numerusform><numerusform>pred %n urami</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>zdaj</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Pred manj kot minuto</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>pred %n minuto</numerusform><numerusform>pred %n minutama</numerusform><numerusform>pred %n minutami</numerusform><numerusform>pred %n minutami</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Pred nekaj časa</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n leto</numerusform><numerusform>%n leti</numerusform><numerusform>%n leta</numerusform><numerusform>%n let</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n mesec</numerusform><numerusform>%n meseca</numerusform><numerusform>%n meseci</numerusform><numerusform>%n mesecev</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n dan</numerusform><numerusform>%n dneva</numerusform><numerusform>%n dnevi</numerusform><numerusform>%n dni</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n ura</numerusform><numerusform>%n uri</numerusform><numerusform>%n ure</numerusform><numerusform>%n ur</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minuta</numerusform><numerusform>%n minuti</numerusform><numerusform>%n minute</numerusform><numerusform>%n minut</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekunda</numerusform><numerusform>%n sekundi</numerusform><numerusform>%n sekunde</numerusform><numerusform>%n sekund</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Izgrajeno na osnovi predelave Git <a href="%1">%2</a> na %3, %4 z uporabo Qt %5, %6</small></p></translation>
</message>
<translation>Napaka</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Neznano</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>prejemanje</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>pošiljanje</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>brisanje</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>premikanje</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>Prezrto</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>napaka</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Одредишни фајл има неочекивану величину или време измене</translation>
</message>
<translation>Неозначене фасцикле биће <b>уклоњене</b> из локалног фајл-система и више се неће синхронизовати на овом рачунару</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Примени</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Одустани</translation>
</message>
<translation>Повезан са <server> као <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Није подешен налог.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Додај нови</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Уклони</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Налог</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Изаберите шта синхронизовати</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Прављење фасцикле није успело</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Синхронизација у току</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 искоришћено</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 као <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Повезан са %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сервер %1 је привремено недоступан.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Одјављен са %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Пријава</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Нове фасцикле нису синхронизоване јер су превелике:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Потврда уклањања налога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Уклони везу</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Отвори фасциклу</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Одјава</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Настави синхронизацију</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Паузирај синхронизацију</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1% од %2 искоришћено</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<source>Currently there is no storage usage information available.</source>
<translation>Тренутно нема доступних података о заузећу складишта.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Нема подешене %1 везе.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Активност сервера</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Протокол синхронизације</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Списак занемарених или фајлова са грешком</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Копирај</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Копирај активност у клипборд.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Несинхронизовано</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Копирано у клипборд</translation>
</message>
<translation><br/>Налог %1 нема укључене активности.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation>Прекинуо корисник</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Локална фасцикла %1 не постоји.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 би требало да је фасцикла али није.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 није читљив.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 је уклоњен.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 је преузет.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 је ажуриран.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 је преименован у %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 је премештен у %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 није синхронизован због грешке. Погледајте записник за детаље.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Активност синхронизације</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>Не могу да прочитам системски списак за игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Уклонити све фајлове?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Уклони све фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Остави фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Не могу да ресетујем стање фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation> (резерва)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation> (резерва %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Неодређено стање.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Припремам синхронизацију.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Синхронизација у току.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Последња синхронизација је била успешна.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последња синхронизација је била успешна али са упозорењима за поједине фајлове.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Грешка подешавања.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Корисник прекинуо.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Синхронизација је паузирана.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (синхронизација паузирана)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Немате дозволе за упис у изабрану фасциклу!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>фајл %1 од %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Чекам...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Припремам синхронизацију...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Нема е-ознаке са сервера. Проверите прокси или мрежни излаз</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Добијена је различита е-ознака за наставак преноса. Покушаћу поново следећи пут.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Сервер је вратио погрешан опсег садржаја</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Време за повезивање је истекло</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Унесите %1 лозинку:
-
-Корисник: %2
-Налог: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Унесите лозинку</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Време повезивања истекло</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Повежи %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Унесите корисничке акредитиве</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Успешно повезан са %1: %2 верзија %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Неуспешно повезивање са %1 на %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Време је истекло у покушају повезивања са %1 на %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Покушавам да се повежем са %1 на %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Аутентификован захтев серверу је преусмерен на %1. УРЛ је лош, сервер је лоше подешен.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Добијен је неисправан одговор на аутентификовани ВебДАВ захтев</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Сервер није дозволио приступ. Да проверите имате ли исправан приступ, <a href="%1">кликните овде</a> да бисте приступили услузи из прегледача.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Локална фасцикла %1 већ постоји. Одређујем је за синхронизацију.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Правим локалну фасциклу синхронизације %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>у реду</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>неуспешно</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Не могу да направим локалну фасциклу %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Није наведена удаљена фасцикла!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Грешка: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>правим фасциклу у облаку: % 1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Удаљена фасцикла %1 је успешно направљена.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Удаљена фасцикла %1 већ постоји. Повезујем се ради синхронизовања.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Прављење фасцикле довело је до ХТТП грешке са кодом %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Прављење удаљене фасцикле није успело због погрешних акредитива!<br/>Идите назад и проверите ваше акредитиве.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Прављење удаљене фасцикле није успело због погрешних акредитива.</font><br/>Идите назад и проверите ваше акредитиве.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Прављење удаљене фасцикле %1 није успело због грешке <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Веза за синхронизацију %1 до удаљеног директоријума %2 је подешена.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Успешно повезан са %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Не може се успоставити веза са %1. Проверите поново.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Преименовање није успело</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Не могу да уклоним и направим резервну копију фасцикле јер су фасцикла или фајл отворени у другом програму. Затворите фасциклу или фајл и покушајте поново или одустаните од подешавања.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Локална фасцикла за синхронизовање %1 је успешно направљена!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 чаробњак повезивања</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Прескочи подешавање фасцикли</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Фајл %1 се не може преузети јер се судара са називом локалног фајла!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Фајл је обрисан са сервера</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Фајл није могао бити преузет у потпуности.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
- <translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Фајл је измењен у међувремену</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<translation>Фајл %1 се не може преименовати у %2 због сударања са називом локалног фајла</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Ова фасцикла се не сме преименовати. Зато је враћен првобитни назив.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Ова фасцикла се не сме преименовати. Молим вас вратите назив у „Shared“.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Фајл је био преименован али је део дељења које је само за читање. Оригинални фајл је враћен.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Сервер је вратио лош ХТТП код. Очекивано је 201 али је примљено „%1 %2“.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Фајл уклоњен</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Локални фајл је измењен током синхронизације. Биће настављена.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Локални фајл измењен током синхронизације.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation>Присили прекид посла код прекида ХТТП везе са КуТ < 5.4.2</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Адреса упита недостаје</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Локални фајл је уклоњен током синхронизације.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<translation>оунКлауд путања:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 дељење</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Фасцикла: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Фајл се не може делити јер је подељен без дозволе за поновно дељење.</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Копирај &везу</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>уређивање</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>&Заштићено лозинком</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Заштићено лозинком</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Фајл се не може делити јер је подељен без дозволе за поновно дељење.</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Јавно дељење з&хтева лозинку</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Поставите лозинку</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Веза дељења</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Грешка пријављивања</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Успешно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync има грешку при обради интерног стабла.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не може да резервише меморију.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync фатална грешка параметара.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>CSync није успео да ажурира корак процесирања.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync није успео да усклади корак процесирања.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не може да се аутентификује на проксију.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не налази прокси или сервер.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не може да се аутентификује на %1 серверу.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не може да приступи мрежи.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>Истекло је време за повезивање.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>Дошло је до грешке ХТТП преноса.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: нема простора на %1 серверу.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync недефинисана грешка.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Прекинуо корисник</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync није приступио</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Услуга је привремено недоступна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Приступ је забрањен</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>Десила се интерна грешка број %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Ставка није синхронизована због ранијих грешака: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Симболичке везе нису подржане у синхронизацији.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>Фајл се налази на листи за игнорисање.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Назив фајла је предугачак.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Кодирање назива фајла није исправно</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation>Није могуће покренути у синхронизацију дневника.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Не могу да отворим дневник синхронизације</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Назив садржи бар један недозвољен карактер</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Игнорисано јер се не налази на листи за синхронизацију</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Није могуће уклањање. Враћам</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>Локални фајлови и дељена фасцикла су уклоњени.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Премештање није дозвољено. Ставка је враћена</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Премештање није дозвољено јер %1 је само за читање</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>одредиште</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>извор</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Верзија %1. За више информација посетите <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Дистрибуира %1 под ГНУ општом јавном лиценцом (ОЈЛ) верзија 2.0.<br/>%2 и %2 лого су регистроване марке %1 у САД, другим земљама или обоје</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Пријавите се</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Фасцикла %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Нема подешених фасцикли за синхронизацију.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Нема подешених фасцикли за синхронизацију.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Отвори у прегледачу</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Пријави се...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Одјава</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Недавне измене</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Проверавам измене у „%1“</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Управљане фасцикле:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Отвори фасциклу „%1“</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Отвори %1 у прегледачу</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Непознато стање</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Поставке...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Детаљи...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Помоћ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Напусти %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Одјављен са %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Одјављен са налога:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Налог %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Одјави се са свих налога</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Пријави се на све налоге...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Падни сада</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Ништа није недавно синхронизовано</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Синхронизујем %1 од %2 (преостало %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Синхронизујем %1 (преостало %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Ажурно</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Текст ознака</translation>
</message>
<translation>&Почни чисту синхронизацију (брише локалну фасциклу!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Изаберите шта синхронизовати</translation>
</message>
<translation>Син&хронизуј све са сервера</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Порука стања</translation>
</message>
<translation>Образац</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Корисничко име</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Лозинка</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Ознака грешке</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Текст ознака</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>пре мање од минут</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>пре неког времена</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Направљено од ГИТ ревизије <a href="%1">%2</a> %3, %4 користећи КуТ %5, %6</small></p></translation>
</message>
<translation>Грешка</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Непознато</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>преузимам</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>отпремам</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>бришем</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>премештам</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>игноришем</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>грешка</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Destinationsfilen har en oväntad storlek eller modifieringstidpunkt</translation>
</message>
<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="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Tillämpa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
<translation>Ansluten till <server> som <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Inget konto är konfigurerat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Lägg till ny</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Radera</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Välj vad som ska synkas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Ta bort anslutning till mappsynkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Kunde inte skapa mappen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation><p>Kunde inte skapa lokal mapp <i>%1</i>.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bekräfta radering av anslutning till mappsynkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Ta bort anslutning till mappsynkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Synkronisering pågår</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 används</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 som <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Serverversion %1 är gammal och stöds inte längre! Fortsätt på egen risk.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Ansluten till %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Servern %1 är för tillfället inte tillgänglig.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>Utloggad från %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation>Ingen anslutning till %1 vid %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Logga in</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Det finns nya mappar som inte synkroniserades på grund av att det är för stora:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Bekräfta radering an kontot</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<source><p>Do you really want to remove the connection to the account <i>%1</i>?</p><p><b>Note:</b> This will <b>not</b> delete any files.</p></source>
<translation><p>Vill du verkligen avsluta anslutningen till kontot <i>%1</i>?</p><p><b>Observera:</b> Detta kommer <b>inte</b> radera några filer.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Radera anslutning</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Öppna mapp</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Logga ut</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Återuppta synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Pausa synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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>Vill du verkligen avbryta synkronisering av mappen <i>%1</i>?</p><p><b>Observera:</b> Detta kommer <b>inte</b> radera några filer.</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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 används. Vissa mappar, inklusive nätverks- eller delade mappar, kan ha andra begränsningar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 av %2 används</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Serveraktivitet</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Synkprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Lista av ignorerade eller felaktiga filer</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopiera</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiera aktivitetslistan till urklipp.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Inte synkroniserad</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Inte synkad (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Listan på serveraktivitet har kopierats till urklipp.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Listan på synkaktivitet har kopierats till urklipp.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Listan över osynkroniserade objekt har kopierats till urklipp.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Kopierat till urklipp</translation>
</message>
<translation><br/>Kontot %1 har inte aktiviteter aktiverade</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Du har mottagit %n ny notifiering från %2.</numerusform><numerusform>Du har mottagit %n nya notifieringar från %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Du tog emot %1 ny notis från %1 och %2.</numerusform><numerusform>Du tog emot %n nya notiser från %1 och %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Du tog emot nya notiser från %1, %2 och andra konton.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Notiser - Åtgärd krävs</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Den lokala mappen %1 finns inte.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 borde vara en mapp, men är inte det.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har tagits bort.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har laddats ner.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har döpts om till %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 och %n andra filer har tagits bort.</numerusform><numerusform>%1 och %n andra filer har tagits bort.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 och %n andra filer har laddats ner.</numerusform><numerusform>%1 och %n andra filer har laddats ner.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 och %n andra filer har uppdaterats.</numerusform><numerusform>%1 och %n andra filer har uppdaterats.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 har döpts om till %2 och %n andra filer har döpts om.</numerusform><numerusform>%1 har döpts om till %2 och %n andra filer har döpts om.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 har flyttats till %2 och %n andra filer har flyttats.</numerusform><numerusform>%1 har flyttats till %2 och %n andra filer har flyttats.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 och %n andra filer har synk-konflikter.</numerusform><numerusform>%1 och %n andra filer har synk-konflikter.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 har en synk-konflikt. Vänligen kontrollera konfliktfilen!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 och %n andra filer kunde inte synkas på grund av fel. Se loggen för detaljer.</numerusform><numerusform>%1 och %n andra filer kunde inte synkas på grund av fel. Se loggen för detaljer.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunde inte synkroniseras på grund av ett fel. Kolla loggen för ytterligare detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<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="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>En ny mapp större än %1 MB har lagts till: %2.
Var god gå in i inställningarna för att markera mappen om du vill ladda ner den.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Är du säker på att du vill fortsätta?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Denna synkning skulle återställa filerna till en tidigare tidpunkt i synkmappen '%1'.
-Det kan vara på grund av att en backup återställts på servern..
-Om du fortsätter synkningen leder till att dina filer skrivs över av äldre filer i ett tidigare stadium. Vill du spara dina senaste lokala filer som konfliktfiler?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Backup upptäckt</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Behåll lokala filer som konflikt</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Kunde inte återställa mappens skick</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(säkerhetskopia)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(säkerhetkopia %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Ingen giltig mapp markerad!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>Den markerade sökvägen är inte en mapp!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Den lokala mappen %1 synkas redan. Var god välj en annan!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokala mappen %1 innehåller redan en mapp som synkas. Var god välj en annan!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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 lokala mappen %1 är en symbolisk länk. Länkmålet innehåller redan en mapp som synkas. Var god välj en annan!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokala mappen %1 finns redan inuti en mapp som synkas. Var god välj en annan!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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 lokala mappen %1 är en symbolisk länk. Länkmålet finns redan inuti en mapp som synkas. Var god välj en annan!</translation>
</message>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>%5 kvar, %1 av %2, fil %3 av %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>fil %1 av %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Väntar...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Väntat på %n annan mapp...</numerusform><numerusform>Väntat på %n andra mappar...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Förbereder för att synkronisera...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<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/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Servern returnerade felaktig content-range</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Anslutningen avbröts på grund av timeout</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Var god ange %1 lösenord:
-
-Användare: %2
-Konto: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>Avläsning från kedjan misslyckades med felkod: '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Ange lösenord</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Tidsgräns för anslutningen överskreds</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&E-post</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>Anslut till %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Ange inloggningsuppgifter</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Lyckades ansluta till %1: %2 version %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Misslyckades att ansluta till %1 vid %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Försök att ansluta till %1 på %2 tog för lång tid.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Försöker ansluta till %1 på %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Den autentiserade begäran till servern omdirigerades till '%1'. Den URLen är ogiltig, server är felkonfigurerad.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Det kom ett ogiltigt svar på en autentiserad webdav-begäran</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Åtkomst förbjuden av servern. För att bekräfta att du har korrekta rättigheter, <a href="%1">klicka här</a> för att ansluta till tjänsten med din webb-läsare.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Lokal synkmapp %1 finns redan, aktiverar den för synk.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Skapar lokal synk-mapp %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>misslyckades.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Kunde inte skapa lokal mapp %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Ingen fjärrmapp specificerad! </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Fel: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>skapar mapp på ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Fjärrmapp %1 har skapats.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Fjärrmappen %1 finns redan. Ansluter den för synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Skapande av mapp resulterade i HTTP felkod %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Det gick inte att skapa mappen efter som du inte har tillräckliga rättigheter!<br/>Vänligen återvänd och kontrollera dina rättigheter.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Misslyckades skapa fjärrmappen, troligen p.g.a felaktiga inloggningsuppgifter.</font><br/>Kontrollera dina inloggningsuppgifter.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Misslyckades skapa fjärrmapp %1 med fel <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>En synkroniseringsanslutning från %1 till fjärrmappen %2 har skapats.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Ansluten till %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Anslutningen till %1 kunde inte etableras. Var god kontrollera och försök igen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Omdöpning av mapp misslyckades</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Kan inte ta bort och göra en säkerhetskopia av mappen på grund av att mappen eller en fil i den används av ett annat program. Vänligen stäng mappen eller filen och försök igen eller avbryt installationen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Lokal synkmapp %1 skapad!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Anslutningsguiden</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Hoppa över konfiguration utav mappar</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Nedladdningen skulle innebära ledigt utrymme understiger %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Ledigt utrymme är under %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Filen har tagits bort från servern</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Filen kunde inte laddas ner fullständigt.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>Den nedladdade filen är tom men servern sa att den skulle vara %1.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Filen har ändrats sedan upptäckten</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Fel vid skrivning av metadata till databasen</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Filen %1 kan inte döpas om till %2 på grund av ett lokalt filnamn</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Denna mapp får inte byta namn. Den kommer att döpas om till sitt ursprungliga namn.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Denna mapp får ej döpas om. Vänligen döp den till Delad igen.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>En fil döptes om men är en del av en endast-läsbar delning. Original filen återställdes.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Felaktig HTTP-kod i svaret från servern. '201' förväntades, men "%1 %2" mottogs.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Filen Raderad</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Lokal fil ändrades under synkningen. Den kommer återupptas.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Lokal fil ändrades under synk.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation>Tvinga jobbavbryt vid återställning av HTTP-anslutning med Qt < 5.4.2.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Hämtnings-URL saknas</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Den lokala filen togs bort under synkronisering.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Servern bekräftade inte senaste leveransen. (Ingen e-tagg fanns)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Fel vid skrivning av metadata till databasen</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Sökväg till ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 Delning</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Mapp: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Servern tillåter inte delning</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Tar emot maximal delningsbehörighet från servern...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Filen kan inte delas eftersom den delades utan delningsrättigheter.</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Kopiera &länk</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Tillåt redigering</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>L&ösenordsskydda</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Lösenordsskyddad</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Filen kan inte delas eftersom den delades utan delningsrättigheter.</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Publik d&elning kräver lösenord</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Var vänlig sätt lösenord</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Dela länk</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Login fel</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Lyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<source>CSync failed to load the journal file. The journal file is corrupted.</source>
<translation>CSync misslyckades med att ladda journalfilen. Journalfilen är korrupt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync misslyckades att reservera minne.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync fatal parameter fel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>CSync processteg update misslyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync processteg reconcile misslyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>Ett HTTP överföringsfel inträffade.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Den monterade mappen är tillfälligt otillgänglig på servern</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>En fel inträffande under öppnandet av en mapp</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Fel vid mappinläsning.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Filen/Mappen är ignorerad för att den är dold.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Endast %1 tillgängligt, behöver minst %2 för att starta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till övermappar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till filer i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync ospecificerat fel.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Avbruten av användare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>Filnamnet innehåller otillåtna tecken som inte kan synkroniseras till andra plattformar.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync misslyckades med att läsa</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync misslyckades med att ladda eller skapa journalfilen. Säkerställ att du har rättigheter att läsa och skriva i den lokala synkmappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync misslyckades på grund av ohanterad avslagning av rättighet.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync försökte skapa en mapp som redan finns.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Tjänsten är tillfälligt otillgänglig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Tillgång förbjuden</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>Ett internt fel nummer %1 inträffade.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<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="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Filnamnet är för långt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Stat misslyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Filnamnskodning är inte giltig</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>Otillåtna tecken, var vänlig byt namn på "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kunde inte läsa svartlistan från den lokala databasen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Kunde inte läsa från synk-journalen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Filnamnet innehåller minst ett ogiltigt tecken</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till undermappar i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<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="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<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="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>destinationen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>källan</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Version %1. För mer information vänligen besök <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Distribueras av %1 och licenserad under GNU General Public License (GPL) Version 2.0.<br/>%2 och %2 logotyp är registrerade varumärken av %1 i Förenta Staterna, andra länder, eller både och.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Vänliga logga in</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Mapp %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Ingen synkroniseringsmapp är konfigurerad.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Det finns inga synkmappar konfigurerade.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Öppna i webbläsare</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Logga in...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Logga ut</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Senaste ändringar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>Kollar efter ändringar i '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Hanterade mappar:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Öppna mapp '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Öppna %1 i webbläsaren</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Okänd status</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Inställningar...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Detaljer...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Hjälp</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Avsluta %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>Koppla från %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Serverversion stöds inte</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Servern på konto %1 kör en gammal version %2 som inte längre stöds. Att använda den här klienten med den serverversionen är otestat och potentiellt farligt. Fortsätt på egen risk.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Bortkopplad från dessa konton:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Synkronisering för konto är avstängd</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Sluta pausa alla mappar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Pausa alla mappar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Sluta pausa all synkroinisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Sluta pausa synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Pausa all synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Pausa synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Logga ut från alla konton</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Logga in på alla konton...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Krascha nu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Inga filer har synkroniseras nyligen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synkroniserar %1 av %2 (%3 kvar)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synkroniserar %1 (%2 kvar)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Aktuell version</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Textetikett</translation>
</message>
<translation>Starta en %ren synkning (tar bort den lokala mappen!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Välj vad som ska synkas</translation>
</message>
<translation>S&ynka allt från servern</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Statusmeddelande</translation>
</message>
<translation>Form</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Användarnamn</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Lösenord</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Felmeddelande</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Textetikett</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>i framtiden</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n dag sedan</numerusform><numerusform>%n dag(ar) sedan</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n timme sedan</numerusform><numerusform>%n timmar sedan</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>nu</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Mindre än en minut sedan</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n minut sedan</numerusform><numerusform>%n minut(er) sedan</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>En stund sedan</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n år</numerusform><numerusform>%n år</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n månad(er)</numerusform><numerusform>%n månad(er)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n dag(ar)</numerusform><numerusform>%n dag(ar)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n timme/timmar</numerusform><numerusform>%n timme/timmar</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n minut(er)</numerusform><numerusform>%n minut(er)</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n sekund(er)</numerusform><numerusform>%n sekund(er)</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Byggd från Git revision <a href="%1">%2</a> den %3, %4 med Qt %5, %6</small></p></translation>
</message>
<translation>Fel</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Okänt</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>laddar ner</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>laddar upp</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>raderar</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>flyttar</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ignorerar</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>fel</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>แฟ้มปลายทางมีขนาดที่ระบุไม่ได้หรือการปรับเปลี่ยนเวลา</translation>
</message>
<translation>โฟลเดอร์ที่ไม่ถูกตรวจสอบจะถูก <b>ลบ</b> จากระบบแฟ้มต้นทางของคุณและจะไม่ประสานข้อมูลกับคอมพิวเตอร์เครื่องนี้อีกต่อไป</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>นำไปใช้</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>ยกเลิก</translation>
</message>
<translation>เชื่อมต่อกับ <server> ด้วยผู้ใช้ <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>ไม่มีการกำหนดค่าบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>เพิ่มใหม่</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>ลบออก</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>บัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>เลือกข้อมูลที่ต้องการประสาน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>ลบโฟลเดอร์ที่ประสานข้อมูลออก</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>สร้างโฟลเดอร์ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>ยืนยันการลบโฟลเดอร์ที่ประสานข้อมูลออก</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>ลบโฟลเดอร์ที่ประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>กำลังประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 กำลังถูกใช้งาน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 เช่น <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>เซิร์ฟเวอร์เวอร์ชัน %1 เป็นรุ่นเก่าและไม่ได้รับการสนับสนุน! ดำเนินการความเสี่ยงด้วยคุณเอง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>เชื่อมต่อกับ %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>เซิร์ฟเวอร์ %1 ไม่สามารถใช้ได้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>ลงชื่อออกจาก %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation>ไม่มีการเชื่อมต่อไปยัง %1 ที่ %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>เข้าสู่ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>มีโฟลเดอร์ใหม่ที่จะไม่ถูกประสานข้อมูลเพราะมันมีขนาดใหญ่เกินไป</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>ยืนยันการลบบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>ลบการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>เปิดโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>ประสานข้อมูลอีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>หยุดประสานข้อมูลชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>มีการใช้งาน %1 จาก %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<source>Currently there is no storage usage information available.</source>
<translation>ขณะนี้ไม่มีพื้นที่จัดเก็บข้อมูลที่ใช้งานได้</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>กิจกรรมของเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>โปรโตคอลที่ใช้ในการผสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>รายชื่อของไฟล์ที่ถูกเพิกเฉยหรือมีผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>คัดลอก</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>คัดลอกรายชื่อกิจกรรมไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>ไม่ถูกประสานข้อมูลให้ตรงกัน</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>ไม่ถูกประสานข้อมูล (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>รายการกิจกรรมเซิร์ฟเวอร์ได้ถูกคัดลอกไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>รายการกิจกรรมการประสานข้อมูลได้ถูกคัดลอกไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>รายชื่อที่ไม่ถูกประสานข้อมูลได้รับการคัดลอกไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>คัดลอกไปยังคลิปบอร์ด</translation>
</message>
<translation><br />บัญชี %1 ไม่มีกิจกรรมที่เปิดใช้งาน</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>คุณได้รับ %n การแจ้งเตือนใหม่จาก %2</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>คุณได้รับ %n การแจ้งเตือนใหม่จาก %1 และ %2</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>คุณได้รับการแจ้งเตือนใหม่จาก %1, %2 และผู้ใช้อื่นๆ</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 การแจ้งเตือน - จำเป็นต้องดำเนินการ</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation>ยกเลิกโดยผู้ใช้</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>โฟลเดอร์ต้นทาง %1 ไม่มีอยู่</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 ควรจะเป็นโฟลเดอร์ แต่ทำไม่ได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกลบออก</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกดาวน์โหลด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกอัพเดทเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ได้ถูกเปลี่ยนชื่อเป็น %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ได้ถูกย้ายไปยัง %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆได้ถูกลบออก</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆ ได้ถูกดาวน์โหลดเรียบร้อยแล้ว</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆ ได้รับการอัพเดท</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ได้ถูกเปลี่ยนชื่อเป็น %2</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 และไฟล์อื่นๆอีก %n ไฟล์ได้ถูกย้ายไปยัง %2</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆ เกิดปัญหาขณะประสานข้อมูล</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 มีปัญหาขณะประสานข้อมูล กรุณาตรวจสอบไฟล์ที่มีปัญหานั้น</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
- <translation><numerusform>%1 à¹\81ละà¹\84à¸\9fลà¹\8cà¸à¸·à¹\88à¸\99à¹\86à¸à¸µà¸\81 %n à¹\84à¸\9fลà¹\8cà¹\84มà¹\88สามารà¸\96à¸\9bระสาà¸\99à¸\82à¹\89à¸à¸¡à¸¹à¸¥à¹\80à¸\99ืà¹\88à¸à¸\87à¸\88าà¸\81à¹\80à¸\81ิà¸\94à¸\82à¹\89à¸à¸\9cิà¸\94à¸\9eลาà¸\94 à¸\81รุà¸\93าà¸\94ูà¸\9aัà¸\99à¸\97ึà¸\81สำหรัà¸\9aรายละà¹\80à¸à¸µà¸¢à¸\94</numerusform></translation>
+ <translation><numerusform>%1 à¹\81ละà¹\84à¸\9fลà¹\8cà¸à¸·à¹\88à¸\99à¹\86à¸à¸µà¸\81 %n à¹\84à¸\9fลà¹\8cà¹\84มà¹\88สามารà¸\96à¸\9bระสาà¸\99à¸\82à¹\89à¸à¸¡à¸¹à¸¥à¹\80à¸\99ืà¹\88à¸à¸\87à¸\88าà¸\81à¹\80à¸\81ิà¸\94à¸\82à¹\89à¸à¸\9cิà¸\94à¸\9eลาà¸\94 à¸\81รุà¸\93าà¸\94ูà¹\84à¸\9fลà¹\8c log สำหรัà¸\9aรายละà¹\80à¸à¸µà¸¢à¸\94à¹\80à¸\9eิà¹\88มà¹\80à¸\95ิม</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
- <translation>%1 à¹\84มà¹\88สามารà¸\96à¸\9bระสาà¸\99à¸\82à¹\89à¸à¸¡à¸¹à¸¥à¹\80à¸\99ืà¹\88à¸à¸\87à¸\88าà¸\81มีà¸\82à¹\89à¸à¸\9cิà¸\94à¸\9eลาà¸\94 à¸\94ูà¸\9aัà¸\99à¸\97ึà¸\81สำหรัà¸\9aรายละà¹\80à¸à¸µà¸¢à¸\94</translation>
+ <translation>%1 à¹\84มà¹\88สามารà¸\96à¸\9bระสาà¸\99à¸\82à¹\89à¸à¸¡à¸¹à¸¥à¹\80à¸\99ืà¹\88à¸à¸\87à¸\88าà¸\81มีà¸\82à¹\89à¸à¸\9cิà¸\94à¸\9eลาà¸\94 สามารà¸\96à¸\94ูà¹\84à¸\9fลà¹\8c log สำหรัà¸\9aรายละà¹\80à¸à¸µà¸¢à¸\94à¹\80à¸\9eิà¹\88มà¹\80à¸\95ิม</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>ความเคลื่อนไหวของการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>ลบไฟล์ทั้งหมด?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>ลบไฟล์ทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>เก็บไฟล์เอาไว้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>การประสานข้อมูลในโฟลเดอร์ '%1' นี้จะถูกคืนค่ากลับไปก่อนหน้านนี้
-อาจจะเป็นเพราะการสำรองข้อมูลที่ได้รับการกู้คืนในเซิฟเวอร์
-นี้จะทำให้ไฟล์ทั้งหมดของคุณจะถูกเขียนทับโดยไฟล์เก่าที่มีอยู่ก่อนหน้านี้ คุณต้องการที่จะเก็บไฟล์ล่าสุดของคุณที่เป็นไฟล์ที่มีปัญหา?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>ตรวจพบการสำรองข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>ประสานข้อมูลปกติ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>เก็บไฟล์ต้นทางเป็นไฟล์ที่มีปัญหา</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>ไม่สามารถรีเซ็ตสถานะโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(สำรองข้อมูล)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(สำรองข้อมูล %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>กำลังรอเริ่มต้นการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>กำลังเตรียมการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>การประสานข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>ประสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>การประสานข้อมูลสำเร็จ แต่มีคำเตือนในแต่ละไฟล์</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>ยกเลิกผู้ใช้</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>การประสานข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (การประสานข้อมูลถูกหยุดชั่วคราว)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>เลือกโฟลเดอร์ไม่ถูกต้อง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>เส้นทางที่เลือกไม่ใช่โฟลเดอร์!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>คุณมีสิทธิ์ที่จะเขียนโฟลเดอร์ที่เลือกนี้!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>เหลืออีก %5 ไฟล์, %1 ไฟล์จาก %2, %3 ไฟล์จาก %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>ไฟล์ %1 จาก %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>กรุณารอซักครู่...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>กำลังรออีก (%n) โฟลเดอร์...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>กำลังเตรียมพร้อมในการประสานข้อมูล</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>ไม่มี E-Tag ที่ได้รับจากเซิร์ฟเวอร์ กรุณาตรวจสอบ พร็อกซี่หรือเกตเวย์</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>เราได้รับ E-Tag ที่แตกต่างกันสำหรับการทำงาน กรุณาลองอีกครั้งในเวลาถัดไป</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>เซิร์ฟเวอร์ส่งคืนช่วงของเนื้อหาที่ผิด</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>หมดเวลาการเชื่อมต่อ</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>กรุณากรอก %1 รหัสผ่าน:
-
-ผู้ใช้: %2
-บัญชี: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>อ่านจาก Keychain ล้มเหลวด้วยข้อผิดพลาด: '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>ป้อนรหัสผ่าน</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<message>
<location filename="../src/gui/logbrowser.cpp" line="59"/>
<source>Log Output</source>
- <translation>à¸\9aัà¸\99à¸\97ึà¸\81à¸\82à¹\89à¸à¸¡à¸¹à¸¥à¸\9cลลัà¸\9eà¸\98à¹\8c</translation>
+ <translation>à¸\9cลลัà¸\9eà¸\98à¹\8cà¸\82à¸à¸\87à¹\84à¸\9fลà¹\8c log</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="71"/>
<message>
<location filename="../src/gui/logbrowser.cpp" line="98"/>
<source>Clear the log display.</source>
- <translation>ลà¹\89าà¸\87à¸\82à¹\89à¸à¸¡à¸¹à¸¥à¸\9aัà¸\99à¸\97ึà¸\81ที่แสดงอยู่</translation>
+ <translation>ลà¹\89าà¸\87à¸\82à¹\89à¸à¸¡à¸¹à¸¥à¹\84à¸\9fลà¹\8c log ที่แสดงอยู่</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="104"/>
<message>
<location filename="../src/gui/logbrowser.cpp" line="105"/>
<source>Save the log file to a file on disk for debugging.</source>
- <translation>บันทึกไฟล์บันทึกการเปลี่ยนแปลงไปที่ไฟล์ที่อยู่ดิสก์เพื่อตรวจสอบข้อผิดพลาด</translation>
+ <translation>บันทึกไฟล์ log บนดิสก์เพื่อตรวจสอบข้อผิดพลาด</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="184"/>
<message>
<location filename="../src/gui/logbrowser.cpp" line="194"/>
<source>Could not write to log file %1</source>
- <translation>ไม่สามารถเขียนไฟล์บันทึก %1</translation>
+ <translation>ไม่สามารถเขียนไฟล์ log %1</translation>
</message>
</context>
<context>
<message>
<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>
+ <translation><nobr>ไฟล์ '%1'<br/>ไม่สามารถเปิดขึ้นมาเพื่อเขียนข้อมูลได้<br/><br/>ผลลัพธ์ของไฟล์ log <b>ไม่สามารถ</b> บันทึกข้อมูลได้!</nobr></translation>
</message>
</context>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>หมดเวลาการเชื่อมต่อ</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>และอีเมล</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>เชื่อมต่อไปยัง %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>ป้อนข้อมูลประจำตัวของผู้ใช้</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">เชื่อมต่อกับ %1: %2 รุ่น %3 (%4) เสร็จเรียบร้อยแล้ว</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>ล้มเหลวในการเชื่อมต่อไปยัง %1 ที่ %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>หมดเวลาขณะที่พยายามเชื่อมต่อไปยัง %1 ที่ %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>กำลังพยายามเชื่อมต่อไปที่ %1 ที่ %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>คำขอการรับรองความถูกต้องไปยังเซิร์ฟเวอร์ที่ถูกเปลี่ยนเส้นทางไปยัง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>มีการตอบสนองที่ไม่ถูกต้องที่จะร้องขอการรับรองความถูกต้องของ WebDAV</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>การเข้าถึงถูกระงับโดยเซิร์ฟเวอร์ เพื่อตรวจสอบว่าคุณมีการเข้าถึงที่เหมาะสม <a href="%1">คลิกที่นี่</a> เพื่อรเข้าถึงบริการกับเบราว์เซอร์ของคุณ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>ประสานข้อมูลโฟลเดอร์ต้นทาง %1 มีอยู่แล้ว กรุณาตั้งค่าเพื่อถ่ายข้อมูล <br/<br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>สร้างประสานข้อมูลโฟลเดอร์ต้นทาง %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ตกลง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>ไม่สามารถสร้างผสานข้อมูลโฟลเดอร์ต้นทาง %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>ไม่มีโฟลเดอร์รีโมทที่ระบุ!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>ข้อผิดพลาด: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>กำลังสร้างโฟลเดอร์ใหม่บน ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>โฟลเดอร์รีโมท %1 ถูกสร้างเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>โฟลเดอร์รีโมทมี %1 อยู่แล้ว กำลังเชื่อมต่อเพื่อถ่ายโอนข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>การสร้างโฟลเดอร์ดังกล่าวส่งผลให้เกิดรหัสข้อผิดพลาด HTTP error code %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>สร้างโฟลเดอร์ระยะไกลล้มเหลวเนื่องจากมีข้อมูลผิดพลาด!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">การสร้างโฟลเดอร์รีโมทล้มเหลว ซึ่งอาจมีสาเหตุมาจากการกรอกข้อมูลส่วนตัวเพื่อเข้าใช้งานไม่ถูกต้อง.</font><br/>กรุณาย้อนกลับไปแล้วตรวจสอบข้อมูลส่วนตัวของคุณอีกครั้ง.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>การสร้างโฟลเดอร์ระยะไกล %1 ล้มเหลวเนื่องข้อผิดพลาด <tt>%2</tt></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>การเชื่อมต่อเผื่อประสานข้อมูลจาก %1 ไปที่ไดเร็กทอรี่ระยะไกล %2 ได้ถูกติดตั้งแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>เชื่อมต่อไปที่ %1! สำเร็จ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>การเชื่อมต่อกับ %1 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>เปลี่ยนชื่อโฟลเดอร์ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>ไม่สามารถลบและสำรองข้อมูลโฟลเดอร์เพราะโฟลเดอร์หรือไฟล์ในนั้นจะเปิดในโปรแกรมอื่นอยู่ กรุณาปิดโฟลเดอร์หรือไฟล์และกดลองใหม่อีกครั้งหรือยกเลิกการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>ประสานข้อมูลโฟลเดอร์ต้นทาง %1 ได้ถูกสร้างขึ้นเรียบร้อยแล้ว!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 ตัวช่วยสร้างการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>ข้ามการกำหนดค่าโฟลเดอร์</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>ไฟล์ %1 ไม่สามารถดาวน์โหลดได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>การดาวน์โหลดจะลดพื้นที่ว่างในดิสก์ด้านล่าง %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>พื้นที่ว่างในดิสก์น้อยกว่า %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>ไฟล์ถูกลบออกจากเซิร์ฟเวอร์</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>ดาวน์โหลดไฟล์ไม่สำเร็จ</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>ไฟล์ที่ดาวน์โหลดว่างเปล่าแม้ว่าเซิร์ฟเวอร์ประกาศว่าควรจะเป็น %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
- <translation>ไฟล์ %1 ไม่สามารถบันทึกได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>ไฟล์ %1 ไม่สามารถเปลี่ยนชื่อเป็น %2 เพราะชื่อไฟล์ต้นทางตรงกัน!</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>โฟลเดอร์นี้จะต้องไม่ถูกเปลี่ยนชื่อ มันจะถูกเปลี่ยนกลับไปใช้ชื่อเดิม</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>โฟลเดอร์นี้จะต้องไม่ถูกเปลี่ยนชื่อ กรุณาตั้งชื่อมันให้เหมือนตอนที่แชร์</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>ไฟล์ที่ถูกเปลี่ยนชื่อ แต่เป็นส่วนหนึ่งของการแชร์เพื่ออ่านเพียงอย่างเดียว ไฟล์ต้นฉบับจะถูกกู้คืน</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>รหัส HTTP ผิดพลาด โดยเซิร์ฟเวอร์คาดว่าจะได้รับรหัส 201 แต่กลับได้รับ "%1 %2"</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>ไฟล์ถูกลบไปแล้ว</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงในระหว่างการซิงค์ มันจะกลับมา</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>ไฟล์ต้นทางถูกเปลี่ยนแปลงขณะกำลังประสานข้อมูล</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation>บังคับให้ยกเลิกงานในการตั้งค่าการเชื่อมต่อ HTTP กับ Qt < 5.4.2</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>URL แบบสำรวจความคิดเห็นหายไป</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>ไฟล์ต้นทางถูกลบออกในระหว่างการประสานข้อมูล</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>เซิร์ฟเวอร์ไม่ยอมรับส่วนสุดท้าย (ไม่มี e-tag ในปัจจุบัน)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>ข้อผิดพลาดในการเขียนข้อมูลเมตาไปยังฐานข้อมูล</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>พาธ ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>กำลังแชร์ %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>โฟลเดอร์: %2 </translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>เซิร์ฟเวอร์ไม่อนุญาตให้แชร์</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>คุณใช้สิทธิ์การเรียกข้อมูลจากเซิฟเวอร์สูงสุดแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>ไม่สามารถแชร์ไฟล์เพราะไม่ได้รับอนุญาต</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>คัดลอก &ลิงค์</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>อนุญาตให้แก้ไข</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>ป้องกันด้วยรหัสผ่าน</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>รหัสผ่านถูกป้องกันแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>ไม่สามารถแชร์ไฟล์เพราะไม่ได้รับอนุญาต</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>การแชร์สาธารณะจำเป็นต้องมีรหัสผ่าน</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>กรุณาตั้งรหัสผ่าน</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&แชร์ลิงค์</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>เข้าสู่ระบบผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>เสร็จสิ้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync เกิดข้อผิดพลาดบางประการในระหว่างประมวลผล internal trees</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>การจัดสรรหน่วยความจำ CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>พบข้อผิดพลาดเกี่ยวกับ CSync fatal parameter</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>การอัพเดทขั้นตอนการประมวลผล CSync ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync ไม่สามารถรับรองความถูกต้องที่พร็อกซี่</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync ไม่สามารถค้นหาพร็อกซี่บนเซิร์ฟเวอร์ได้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync ล้มเหลวในการยืนยันสิทธิ์การเข้าใช้งานที่เซิร์ฟเวอร์ %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync ล้มเหลวในการเชื่อมต่อกับเครือข่าย</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>หมดเวลาการเชื่อมต่อเครือข่าย</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>เกิดข้อผิดพลาดเกี่ยวกับ HTTP transmission</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>โฟลเดอร์ที่ติดตั้งชั่วคราว ไม่สามารถใช้งานบนเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>เกิดข้อผิดพลาดบางอย่างขณะกำลังเปิดโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>เกิดข้อผิดพลาดขณะกำลังอ่านโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>ไฟล์/โฟลเดอร์ ที่ซ่อนอยู่จะถูกละเว้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>มีเพียง %1 ที่พร้อมใช้งาน คุณจำเป็นต้องมีไม่น้อยกว่า %2 เพื่อเริ่มใช้งาน</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: ไม่มีพื้นที่เหลือเพียงพอบนเซิร์ฟเวอร์ %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync ไม่สามารถระบุข้อผิดพลาดได้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>ยกเลิกโดยผู้ใช้</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>ชื่อไฟล์มีอักขระที่ไม่ถูกต้องจึงไม่สามารถประสานข้อมูลข้ามแพลตฟอร์ม</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>ล้มเหลวในการเข้าถึง CSync</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync ล้มเหลวเนื่องจากการอนุญาตให้จัดการได้ถูกปฏิเสธ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync พยายามสร้างโฟลเดอร์ที่มีอยู่แล้ว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>ไม่สามารถใช้บริการได้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>ถูกปฏิเสธการเข้าถึง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>จำนวนข้อผิดพลาดภายในที่เกิดขึ้น %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>รายการจะไม่ถูกประสานข้อมูลเนื่องจากเกิดข้อผิดพลาดก่อนหน้านี้: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>ลิงค์สัญลักษณ์จะไม่ได้รับการสนับสนุนในการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>ไฟล์อยู่ในรายการที่ละเว้น</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>ชื่อไฟล์ยาวเกินไป</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>สถิติความล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>การเข้ารหัสชื่อไฟล์ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>ตัวอักษรไม่ถูกต้อง โปรดเปลี่ยนชื่อ "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation>ไม่สามารถเตรียมการประสานข้อมูลเจอร์นัล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>ไม่สามารถอ่านบัญชีดำจากฐานข้อมูลต้นทาง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>ไม่สามารถอ่านจากบันทึกการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>ไม่สามารถเปิดการผสานข้อมูลเจอร์นัล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>มีชื่อแฟ้มอย่างน้อยหนึ่งตัวอักษรที่ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>ถูกละเว้นเพราะ "ข้อมูลที่เลือกประสาน" ติดบัญชีดำ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>ไม่อนุญาตให้ลบเพราะกำลังฟื้นฟู</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>ไฟล์ต้นทางและโฟลเดอร์ที่แชร์ถูกลบออก</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>ไม่ได้รับอนุญาตให้ย้าย เพราะกำลังกู้คืนรายการ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation>ไม่อนุญาตให้ย้ายเพราะ %1 จะอ่านได้เพียงอย่างเดียว</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>ปลายทาง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>แหล่งที่มา</translation>
</message>
<message>
<location filename="../src/gui/synclogdialog.ui" line="14"/>
<source>Synchronisation Log</source>
- <translation>à¸\9aัà¸\99à¸\97ึà¸\81à¸\81ารà¸\9bระสาà¸\99à¸\82à¹\89à¸à¸¡à¸¹à¸¥</translation>
+ <translation>à¸\81ารà¸\9bระสาà¸\99à¸\82à¹\89à¸à¸¡à¸¹à¸¥à¹\84à¸\9fลà¹\8c Log</translation>
</message>
</context>
<context>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>รุ่น %1 สำหรับข้อมูลเพิ่มเติมกรุณาเยี่ยมชม <a href='%2'>%3</a></p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
- <translation type="unfinished"/>
+ <translation><p>ลิขสิทธิ์ ownCloud GmbH</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>เผยแพร่โดย %1 และมีใบอนุญาตภายใต้ GNU General Public License (GPL) รุ่น 2.0 <br/>%2 และการลงทะเบียนโลโก้ %2 เครื่องหมายการค้าของ %1 ในประเทศสหรัฐอเมริกา ประเทศอื่นๆ หรือทั้งสองอย่าง</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>กรุณาเข้าสู่ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>โฟลเดอร์ %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>ยังไม่มีการกำหนดค่าโฟลเดอร์ที่ต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>ไม่มีการกำหนดค่าการประสานข้อมูลโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>เปิดในเบราว์เซอร์</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>เข้าสู่ระบบ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>การเปลี่ยนแปลงล่าสุด</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>กำลังตรวจสอบการเปลี่ยนแปลงใน '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>เปิดโฟลเดอร์ '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>เปิด %1 ในเบราว์เซอร์</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>สถานะที่ไม่รู้จัก</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>ตั้งค่า...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>รายละเอียด...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>ช่วยเหลือ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>ออก %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>ถูกตัดการเชื่อมต่อจาก %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>ไม่สนับสนุนรุ่นของ Server</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>เซิฟเวอร์บนบัญชี %1 ได้ใช้งานในรุ่นเก่าและเป็นรุ่นที่ไม่ได้รับการสนับสนุนแล้ว %2 หากใช้งานต่อไปอาจเป็นอันตราย ดำเนินการที่มีความเสี่ยงด้วยตัวคุณเอง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>ยกเลิกการเชื่อมต่อจากบัญชี:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>บัญชี %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>บัญชีประสานข้อมูลถูกปิดใช้งาน</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>ทำโฟลเดอร์ทั้งหมดต่อ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>หยุดโฟลเดอร์ทั้งหมดชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>ประสานข้อมูลทั้งหมดต่อ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>ประสานข้อมูลต่อ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>หยุดการประสานข้อมูลทั้งหมดชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>หยุดการประสานข้อมูลชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>ออกจากระบบของบัญชีทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>เข้าสู่ระบบของบัญชีทั้งหมด...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>ความผิดพลาดในขณะนี้</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>ไม่มีรายการที่ถูกประสานข้อมูลเมื่อเร็วๆ นี้</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>กำลังประสานข้อมูล %1 จาก %2 (เหลือ %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>กำลังประสานข้อมูล %1 (เหลือ %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>ถึงวันที่</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>ป้ายข้อความ</translation>
</message>
<translation>เริ่มต้นทำความสะอาดการประสานข้อมูล (ลบโฟลเดอร์ต้นทาง)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>เลือกข้อมูลที่ต้องการประสาน</translation>
</message>
<translation>ผสานข้อมูลทุกอย่างจากเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>ข้อความสถานะ</translation>
</message>
<translation>แบบฟอร์ม</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>และชื่อผู้ใช้</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>และหรัสผ่าน</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>ป้ายกำกับผิดพลาด</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>ป้ายข้อความ</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>ในอนาคต</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n วันที่ผ่านมา</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n ชั่วโมงที่ผ่านมา</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>ตอนนี้</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>ไม่กี่นาทีที่ผ่านมา</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n นาทีที่ผ่านมา</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>บางเวลาที่ผ่านมา</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 กิกะไบต์</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 เมกะไบต์</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 กิโลไบต์</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n ปี</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n เดือน</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n วัน</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n ชั่วโมง</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n นาที</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n วินาที</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>ที่สร้างขึ้นจากการแก้ไข Git <a href="%1">%2</a> บน %3, %4 กำลังใช้ Qt %5, %6</small></p></translation>
</message>
<translation>ข้อผิดพลาด</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>ไม่ทราบ</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>กำลังดาวน์โหลด</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>กำลังอัพโหลด</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>กำลังลบ</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>กำลังย้าย</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>กำลังละเว้น</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>ข้อผิดพลาด</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Hedef dosya beklenilmeyen boyuta veya düzenlenme tarihine sahip</translation>
</message>
<translation>Seçilmemiş klasörler yerel dosya sisteminizden <b>kaldırılacak</b> ve bir daha bu bilgisayarla eşitlenmeyecektir</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Uygula</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<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="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Hiçbir hesap yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Yeni ekle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Kaldır</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Hesap</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Ne eşitleneceğini seçin</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>Klasör eşitleme bağlantısını sil</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<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="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Klasör Eşitleme Bağlantısının Silinmesini Onaylayın</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>Klasör Eşitleme Bağlantısını Sil</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Eşitleme Çalışıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 kullanımda</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>Sunucu sürümü %1 eski ve desteklenmiyor! Kendi riskinizle devam edin.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>%1 ile bağlı.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<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="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>%1 oturumu sonlandırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<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="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Giriş yap</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>Çok büyük olduklarından eşitlenmemiş yeni klasörler mevcut:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Hesap Silinmesini Onaylayın</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>Bağlantıyı kaldır</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Klasörü aç</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Çıkış yap</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>Eşitlemeye devam et</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>Eşitlemeyi duraklat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>%1 / %2 kullanımda</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<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="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Sunucu Etkinliği</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Eşitleme Protokolü</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>Gözardı edilen veya hatalı dosyaların listesi</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Kopyala</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Etkinlik listesini panoya kopyala.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Eşitlenmedi</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Eşitlenmedi (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Sunucu etkinlik listesi panoya kopyalandı.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>Eşitleme etkinlik listesi panoya kopyalandı.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>Eşitlenmemiş ögelerin listesi panoya kopyalandı.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Panoya kopyalandı</translation>
</message>
<translation><br/>%1 hesabının geçerli kılınmış etkinlikleri bulunmamakta.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>%2 için %n yeni bildiriminiz var.</numerusform><numerusform>%2 için %n yeni bildiriminiz var.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>%2 ve %1 için %n yeni bildiriminiz var.</numerusform><numerusform>%2 ve %1 için %n yeni bildiriminiz var.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>%2, %1 ve diğer hesaplardan %n yeni bildiriminiz var.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Bildirim - Eylem Gerekiyor</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>Veritabanına üstveri yazma hatası</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<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="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 yerel klasörü mevcut değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 bir dizin olmalı, ancak değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 indirildi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 güncellendi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1, %2 olarak adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 ve diğer %n dosya kaldırıldı.</numerusform><numerusform>%1 ve diğer %n dosya kaldırıldı.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 ve diğer %n dosya indirildi.</numerusform><numerusform>%1 ve diğer %n dosya indirildi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>'%1' ve diğer %n dosya güncellendi.</numerusform><numerusform>%1 ve diğer %n dosya güncellendi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1, %2 olarak yeniden adlandırıldı ve %n diğer dosyanın adı değiştirildi.</numerusform><numerusform>%1, %2 olarak yeniden adlandırıldı ve %n diğer dosyanın adı değiştirildi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1, %2 konumuna taşındı ve %n diğer dosya taşındı.</numerusform><numerusform>%1, %2 konumuna taşındı ve %n diğer dosya taşındı.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 ve %n diğer dosya eşitleme çakışması bulunduruyor.</numerusform><numerusform>%1 ve %n diğer dosya eşitleme çakışması bulunduruyor.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 bir eşitleme çakışması bulunduruyor. Lütfen çakışan dosyayı kontrol edin!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 ve diğer %n dosya hatalar nedeniyle eşlenemedi. Ayrıntılar için ayıt dosyasına bakın.</numerusform><numerusform>%1 ve diğer %n dosya hatalar nedeniyle eşlenemedi. Ayrıntılar için günlük dosyasına bakın.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 bir hata nedeniyle eşitlenemedi. Ayrıntılar için günlüğe bakın.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>Bu eşitleme, '%1' eşitleme klasörünündeki dosyaları daha önceki bir zamana sıfırlayacak.
-Bunun nedeni sunucuda bir yedeğin geri yüklenmesinden dolayı olabilir. Eşitlemeye normal şekilde devam etmek dosyalarınızın daha önceki durumu ile üzerine yazılmasına sebep olacak. Çakışma durumunda en son yerel dosyalarınızı tutmak ister misiniz?</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Yedek bulundu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>Normal Eşitleme</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>Çakışma Durumunda Yerel Dosyaları Tut</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<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="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation> (yedek)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation> (yedek %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>Eşitlemenin başlanması bekleniyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı oldu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<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="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Kurulum Hatası.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>Geçerli klasör seçilmedi!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>Seçilen yol bir klasör değil!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<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="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü zaten bir eşitleme bağlantısında kullanılan klasördür. Lütfen farklı bir seçim yapın!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü zaten bir eşitleme klasörü içermektedir. Lütfen farklı bir seçim yapın!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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 yerel klasörü sembolik bağlantıdır. Bu bağlantının işaretlediği klasörde zaten yapılandırılmış bir klasör mevcut. Lütfen farklı bir seçim yapın!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü zaten bir eşitleme klasörü içindedir. Lütfen farklı bir seçim yapın!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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 yerel klasörü sembolik bağlantıdır. Bu bağlantının işaretlediği klasör zaten yapılandırılmış bir klasör içindedir. Lütfen farklı bir seçim yapın!</translation>
</message>
<translation>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>Kalan %5, %1/%2, dosya %3/%4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>dosya %1/%2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Bekleniyor...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>Diğer %n klasör bekleniyor...</numerusform><numerusform>Diğer %n klasör bekleniyor...</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>Eşitleme için hazırlanıyor...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Sunucudan E-Tag alınamadı, Vekil Sunucu/Ağ Geçidi'ni denetleyin.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<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/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Sunucu yanlış içerik aralığı döndürdü</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Bağlantı Zaman Aşımı</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>Lütfen %1 parolasını girin:
-
-Kullanıcı: %2
-Hesap: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<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"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Parolayı Girin</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Bağlantı zaman aşımına uğradı</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&E-posta</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>%1 bağlantısını yap</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Kullanıcı kimlik bilgilerini gir</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">%1 bağlantısı başarılı: %2 sürüm %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>%2 üzerinde %1 adresine bağlanılamadı:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>%2 üzerinde %1 bağlantısı yapılırken zaman aşımı.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>%2 üzerinde %1 bağlantısı deneniyor...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Sunucuda giriş sırasında istek '%1' adresine yönlendirilmiş. Adres hatalı veya sunucu yanlış ayarlanmış.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Yetkilendirilmiş webdav isteği geçersiz bir cevap alındı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Erişim sunucu tarafından yasaklandı. Geçerli erişime sahip olup olmadığınızı doğrulamak için hizmete web tarayıcınızla erişmek üzere <a href="%1">buraya tıklayın</a>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Yerel eşitleme klasörü %1 zaten mevcut, eşitlemek için ayarlanıyor.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Yerel eşitleme klasörü %1 oluşturuluyor...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>tamam</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>başarısız.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>%1 yerel klasörü oluşturulamadı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Uzak klasör belirtilmemiş!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Hata: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>ownCloud üzerinde klasör oluşturuluyor: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>%1 uzak klasörü başarıyla oluşturuldu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Uzak klasör %1 zaten mevcut. Eşitlemek için bağlanılıyor.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Klasör oluşturma %1 HTTP hata kodu ile sonuçlandı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Uzak klasör oluşturması, geçersiz kimlik bilgileri nedeniyle başarısız!<br/>Lütfen geri gidin ve bilgileri denetleyin.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Uzak klasör oluşturma muhtemelen hatalı kimlik bilgilerinden dolayı başarısız oldu.</font><br/>Lütfen geri gidip kimlik bilgilerini doğrulayın.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Uzak klasör %1 oluşturma işlemi <tt>%2</tt> hatası ile başarısız oldu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>%1 kaynaklı %2 uzak dizinine bir eşitleme bağlantısı ayarlandı.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>%1 bağlantısı başarılı!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>%1 bağlantısı kurulamadı. Lütfen tekrar denetleyin.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Klasör adlandırma başarısız</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Klasör veya içerisindeki bir dosya farklı bir program içerisinde açık olduğundan, kaldırma ve yedekleme işlemi yapılamıyor. Lütfen klasör veya dosyayı kapatıp yeniden deneyin veya kurulumu iptal edin.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Yerel eşitleme klasörü %1 başarıyla oluşturuldu!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 Bağlantı Sihirbazı</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Klasör yapılandırmasını atla</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>Veritabanına üstveri yazma hatası</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>Dosya indirimi boş disk alanını %1 altına düşürecektir</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>Boş disk alanı %1 altında</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>Dosya sunucudan silindi</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Dosya tamamıyla indirilemedi.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>Sunucu boyutunu %1 olarak duyurmasına rağmen indirilen dosya boş.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Dosya, bulunduğundan itibaren değişmiş</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>Veritabanına üstveri yazma hatası</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>Yerel bir dosya adı çakışması nedeniyle %1 dosyası %2 olarak adlandırılamadı</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>Veritabanına üstveri yazma hatası</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Özgün adına geri dönüştürüldü.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Bu klasörün adı değiştirilmemelidir. Lütfen Shared olarak geri adlandırın.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Dosya adlandırıldı ancak salt okunur paylaşımın bir parçası. Özgün dosya geri yüklendi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Sunucudan yanlış HTTP kodu döndü. 201 bekleniyordu, ancak "%1 %2" geldi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>Veritabanına üstveri yazma hatası</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Dosya Kaldırıldı</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Eşitleme sırasında yerel dosya değişti.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Getirme URL'si eksik</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Eşitleme sırasında yerel dosya kaldırıldı.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>Sunucu son yığını onaylamadı. (Mevcut e-etiket bulunamadı)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>Veritabanına üstveri yazma hatası</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>ownCloud Yolu:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 Paylaşma</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Klasör: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>Sunucu, paylaşımı desteklemiyor</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>Sunucudan mümkün olan en fazla paylaşım hakları alınıyor...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<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>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Bağ&lantıyı kopyala</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Düzenlemeye izin ver</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>&Parola koruması</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Parola Korumalı</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<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/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<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/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>Lütfen Parola Atayın</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&Paylaşma bağlantısı</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Oturum Açma Hatası</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Başarılı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<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="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync bellek ayıramadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync ciddi parametre hatası.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<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="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<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="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<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="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<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="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<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="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<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="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<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="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<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="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>Bağlanan dizin geçici olarak sunucuda mevcut değil</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>Klasör açılırken bir hata oluştu</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>Klasör okunurken hata oluştu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>Dosya/Klasör gizli olduğu için yoksayıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Sadece %1 mevcut, Çalıştırmak için en az %2 gerekmektedir</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<source>Not allowed because you don't have permission to add parent folder</source>
<translation>Üst dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<source>Not allowed because you don't have permission to add files in that folder</source>
<translation>Bu klasöre dosya ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<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="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync belirtilmemiş hata.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Kullanıcı tarafından iptal edildi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<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="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
<translation>CSync, günlük dosyası yüklenemedi veya oluşturalamadı. Lütfen yerel eşitleme dizininde okuma ve yazma izinleriniz olduğundan emin olun.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync ele alınmayan izin reddinden dolayı başarısız.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync, zaten mevcut olan bir klasör oluşturmaya çalıştı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<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="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Erişim yasak</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<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="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<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="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<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="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Dosya adı çok uzun.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>Durum alma başarısız.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<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="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<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="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<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="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Yerel veritabanından kara liste okunamadı</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>Eşitleme günlüğünden okunamadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<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="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Dosya adı en az bir geçersiz karakter içeriyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<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="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<source>Not allowed because you don't have permission to add subfolders to that folder</source>
<translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<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="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<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="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<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="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<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="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>hedef</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>kaynak</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Sürüm %1. Daha fazla bilgi için lütfen <a href='%2'>%3</a> adresini ziyaret edin.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>%1 tarafından dağıtılmış ve GNU Genel Kamu Lisansı (GPL) Sürüm 2.0 ile lisanslanmıştır.<br/>%2 ve %2 logoları ABD ve/veya diğer ülkelerde %1 tescili markalarıdır.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Lütfen oturum açın</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Klasör %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Yapılandırılmış eşitleme klasörü yok.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Yapılandırılmış eşitleme klasörü yok.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Giriş yap...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Çıkış yap</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Son Değişiklikler</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>%1 deki değişiklikler denetleniyor</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Yönetilen Klasörler:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>'%1' klasörünü aç</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>%1'ı tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Bilinmeyen durum</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Ayarlar...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Ayrıntılar...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Yardım</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>%1'tan çık</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>%1 ile bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>Desteklenmeyen Sunucu Sürümü</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>%1 hesabındaki sunucu eski ve desteklenmeyen %2 sürümünde. Bu istemciyi desteklenmeyen sunucu sürümlerinde kullanmak test edilmemiş olmasının yanında muhtemelen tehlikeli. Kendi riskinizle devam edin.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>Bu hesapların bağlantıları kesildi:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Hesap %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>Hesap eşitlemesi devre dışı bırakıldı.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>Tüm klasörleri devam ettir</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>Tüm klasörleri durdur</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>Tüm eşitlemeleri devam ettir</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>Eşitlemeyi devam ettir</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>Tüm eşitlemeleri durdur</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>Eşitlemeyi durdur</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Tüm hesaplardan çıkış yap</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Tüm hesaplara giriş yap...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Şimdi çök</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Yakın zamanda eşitlenen öge yok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Eşitlenen %1/%2 (%3 kaldı)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Eşitlenen %1 (%2 kaldı)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Güncel</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>MetinEtiketi</translation>
</message>
<translation>Temiz bir &eşitleme başlat (Yerel klasörü siler!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Ne eşitleneceğini seçin</translation>
</message>
<translation>Sunucudaki her şeyi &eşitle</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Durum iletisi</translation>
</message>
<translation>Form</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Kullanıcı Adı</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Parola</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Hata Etiketi</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>MetinEtiketi</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>gelecekte</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n gün önce</numerusform><numerusform>%n gün önce</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n saat önce</numerusform><numerusform>%n saat önce</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>şimdi</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>1 dakika önce</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n dakika önce</numerusform><numerusform>%n dakika önce</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Bir süre önce</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n yıl</numerusform><numerusform>%n yıl</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n ay</numerusform><numerusform>%n ay</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n gün</numerusform><numerusform>%n gün</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n saat</numerusform><numerusform>%n saat</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n dakika</numerusform><numerusform>%n dakika</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n saniye</numerusform><numerusform>%n saniye</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small><a href="%1">%2</a> Git gözden geçirmesi ile %3, %4 tarihinde, Qt %5, %6 kullanılarak derlendi.</small></p></translation>
</message>
<translation>Hata</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Bilinmeyen</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>indirilen:</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>yüklenen:</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>silinen:</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>taşınan:</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>yoksayılan:</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>hata</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>Файл призначення має неочікуваний розмір або час редагування</translation>
</message>
<translation>Не позначені теки будуть <b>видалені</b> з вашої системи та більше не будуть синхронізуватися</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>Застосувати</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>Скасувати</translation>
</message>
<translation>Підключено до <server> як <user></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>Обліковий запис не налаштовано.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>Додати</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>Видалити</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>Обліковий запис</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>Оберіть, що хочете синхронізувати</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>Не вдалося створити теку</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<source><p>Could not create local folder <i>%1</i>.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>Виконується синхронізація</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 використовується</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 як <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>Підключено до %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сервер %1 тимчасово недоступний.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>Увійти</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<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="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>Підтвердіть видалення облікового запису</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>Відкрити каталог</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>Вихід</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>Використовується %1 з %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<source>Currently there is no storage usage information available.</source>
<translation>На даний час немає відомостей про наповнення сховища.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>Серверна активність</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>Протокол Синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>Копіювати</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Скопіювати протокол синхронізації до буферу обміну.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>Не синхронізовано</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>Not Synced (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>Список серверних операцій скопійовано до буферу обміну.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>Скопійовано в буфер обміну</translation>
</message>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>Ви отримали %n нове сповіщення від %2.</numerusform><numerusform>Ви отримали %n нових сповіщень від %2.</numerusform><numerusform>Ви отримали %n нових сповіщень від %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>Ви отримали %n нове сповіщення від %1 та %2.</numerusform><numerusform>Ви отримали %n нових сповіщень від %1 та %2.</numerusform><numerusform>Ви отримали %n нових сповіщень від %1 та %2.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>Ви отримали нові сповіщення від %1, %2 та інших облікових записів.</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 Сповіщень - Необхідна Дія</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation>Скасовано користувачем</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальна тека %1 не існує.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 видалено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 завантажено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 оновлено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 перейменовано на %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 переміщено в %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 не може синхронізуватися через помилки. Дивіться деталі в журналі.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>Журнал синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>Неможливо прочитати виключений системний файл</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>Видалити усі файли?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>Видалити усі файли</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>Зберегти файли</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>Резервну копію знайдено</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>Не вдалося скинути стан теки</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>(Резервна копія)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(Резервна копія %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>Підготовка до синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Остання синхронізація пройшла вдало, але були зауваження про деякі файли.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>Помилка встановлення.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>Скасовано користувачем.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>Синхронізація призупинена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Синхронізація призупинена)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>У вас немає прав на запис в цю теку!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>файл %1 з %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>Очікування...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<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="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>Не отримано E-Tag від серверу, перевірте мережеві налаштування (проксі, шлюз)</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>Ми отримали інший E-Tag для відновлення. Спробуйте ще раз пізніше.</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>Сервер повернув невірний content-range</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>Час з'єднання вичерпано</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>Введіть Пароль</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>Час очікування з'єднання вичерпано</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>З'єднати з %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>Вказати облікові дані</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">Успішно підключено до %1: %2 версія %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>Не вдалося з'єднатися з %1 в %2:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Перевищено час очікування з'єднання до %1 на %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Спроба підключення до %1 на %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>Запит аутентифікації до серверу було переадресовано до '%1'. Поганий URL, сервер сконфігуровано неправильно.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Неправильна відповідь на автентифікований запит webdav</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>Доступ заборонений сервером. Щоб довести, що у Вас є права доступу, <a href="%1">клікніть тут</a> для входу через Ваш браузер.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>Локальна тека синхронізації %1 вже існує, налаштування її для синхронізації.<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>Створення локальної теки для синхронізації %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>не вдалося.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>Не вдалося створити локальну теку $1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>Не вказано віддалену теку!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>Помилка: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>створення теки на ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>Віддалена тека %1 успішно створена.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Віддалена тека %1 вже існує. Під'єднання для синхронізації.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Створення теки завершилось HTTP помилкою %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>Створити віддалену теку не вдалося через невірно вказані облікові дані.<br/>Поверніться назад та перевірте облікові дані.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">Створити віддалену теку не вдалося, можливо, через невірно вказані облікові дані.</font><br/>Будь ласка, поверніться назад та перевірте облікові дані.</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>Не вдалося створити віддалену теку %1 через помилку <tt>%2</tt>.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>З'єднання для синхронізації %1 з віддаленою текою %2 було встановлено.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>Успішно під'єднано до %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Підключення до %1 встановити не вдалося. Будь ласка, перевірте ще раз.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>Не вдалося перейменувати теку</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Неможливо видалити теку та створити її резервну копію, оскільки тека або файли, що в ній розташовані, використовуються. Будь ласка, закрийте всі програми, що можуть використовувати цю теку та спробуйте ще раз, або скасуйте встановлення.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>Локальна тека синхронізації %1 успішно створена!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>Майстер з'єднання %1 </translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>Пропустити налаштування теки</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>Файл %1 не може бути завантажено через локальний конфлікт назви файлу! </translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>Файл не може бути завантажений повністю.</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
- <translation>Файл %1 не збережено через локальний конфлікт назви файлу! </translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>Файл змінився з моменту знаходження</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<translation>%1 не можна перейменувати на %2 через локальний конфлікт назви файлу</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>Цю теку не можна перейменувати. Буде використано старе ім'я.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>Цю теку не можна перейменувати. Будь ласка, поверніть їй ім'я Shared.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>Файл було перейменовано, але він розташований в теці з правами лише на перегляд. Відновлено оригінальний файл. </translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>Сервер відповів неправильним HTTP кодом. Очікувався 201, але отримано "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>Файл видалено</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>Локальний файл змінився під час синхронізації. Його буде відновлено.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>Локальний файл змінився під час синхронізації.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation>Примусове припинення завдання при скиданні HTTP з’єднання з Qt < 5.4.2.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>Не вистачає сформованого URL</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>Локальний файл було видалено під час синхронізації.</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<translation>Шлях до ownCloud:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>Ви поділилися %1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>Тека: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Цей файл неможливо поширити, бо ним поділилися без права на поширення.</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>Копіювати п&осилання</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>Дозволити редагування</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>&Захистити паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>Захищено паролем</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>Цей файл неможливо поширити, бо ним поділилися без права на поширення.</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>Публічне по&ширення вимагає пароль</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>По&ділитись посиланням</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>Помилка входу</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>Успішно.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync got an error while processing internal trees.</source>
<translation>У CSync виникла помилка під час сканування внутрішньої структури каталогів.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync не вдалося зарезервувати пам'ять.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>У CSync сталася фатальна помилка параметра.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>CSync не вдалася зробити оновлення .</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync не вдалася зробити врегулювання.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync не вдалося аутентифікуватися на проксі-сервері.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync не вдалося знайти Проксі або Сервер.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync не вдалося аутентифікуватися на %1 сервері.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync не вдалося приєднатися до мережі.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>Час під'єднання до мережі вичерпався.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>Сталася помилка передачі даних по HTTP.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Доступно лише %1, для початку необхідно хоча б %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync: на сервері %1 скінчилося місце.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>Невизначена помилка CSync.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>Скасовано користувачем</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<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="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync не вдалося отримати доступ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>Служба тимчасово недоступна</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>Доступ заборонений</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>Виникла внутрішня помилка за номером %1.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>Шлях не синхронізується через помилки: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронізація символічних посилань не підтримується. </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутній у списку ігнорованих.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>Шлях до файлу занадто довгий.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>Кодування файлу не припустиме</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation>Не вдалося ініціалізувати протокол синхронізації.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>Не вдається відкрити протокол синхронізації</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>Ім’я файлу містить принаймні один некоректний символ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>Ігнорується через чорний список в "обрати що синхронізувати"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>Не дозволено видаляти, відновлюємо</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>Локальні файли та теки в загальному доступі було видалено.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>Переміщення не дозволено, елемент відновлено </translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation>Переміщення не дозволено, оскільки %1 помічений тільки для перегляду</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>призначення</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>джерело</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>Версія %1. Для отримання більш детальної інформації, будь ласка, відвідайте <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>Поширюється через %1 і під ліцензією GNU General Public License (GPL) версії 2.0<br/>%2 логотип %2 є зареєстрованими торговими марками %1 у Сполучених Штатах та інших країнах, або обох.</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>Увійдіть будь ласка</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>Тека %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>Жодна тека не налаштована для синхронізації.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>Немає налаштованих тек для синхронізації.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Відкрити у переглядачі</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>Увійти...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>Вихід</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>Недавні зміни</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Керовані теки:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>Відкрити теку '%1'</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Відкрити %1 в браузері</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>Невідомий статус</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>Налаштування...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>Деталі...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>Допомога</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>Закрити %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>Обліковий запис %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>Вийти зі всіх облікових записів</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>Увійти до всіх облікових записів...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>Критична помилка</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>Нещодавно нічого не синхронізувалося</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Синхронізовано %1 з %2 (залишилося %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>Синхронізовано %1 (залишилося %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>Оновлено</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>Мітка</translation>
</message>
<translation>Почати синхронізацію &заново (Видалить локальну теку!)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>Оберіть, що хочете синхронізувати</translation>
</message>
<translation>Синхронізувати все з сервером</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>Повідомлення про статус</translation>
</message>
<translation>Форма</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>&Ім'я користувача</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>&Пароль</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>Помилка</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>Мітка</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>зараз</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>Менше хвилини тому</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>Деякий час тому</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 ГБ</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 МБ</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 КБ </translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 Б</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>Зібрано з Git ревізії <a href="%1">%2</a> %3, %4, використовуючи Qt %5, %6</small></p></translation>
</message>
<translation>Помилка</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>Невідомо</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>зкачування</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>завантаження</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>видалення</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>переміщення</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>ігнорування</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>помилка</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>目标文件的大小和修改时间无法预料</translation>
</message>
<translation>取消选中的文件夹将会从本地<b>删除</b>，并不再同步到这台电脑上。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>应用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<translation><user> 已经连接到 <server> </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>没有配置的帐号。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>添加</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>移除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>账户</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>选择同步内容</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>断开文件夹同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>文件夹创建失败</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>确定断开文件夹同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>断开文件夹同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>正在同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1, <i>%2</i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>服务器版本 %1 很旧且不支持，继续操作将自行承担风险。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>连接到 %1。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>远程服务器%1暂时不可用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>从 %1 退出</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation>没有到位于%2中的%1的连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>登录</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>部分新文件夹没有被同步，因为文件过大：</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>确认删除账号</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>删除连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>打开文件夹</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>注销</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>恢复同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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>Note:</b> 这 <b>不会</b> 删除任何文件</p></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) of %2 使用中。一些文件夹，例如网络挂载的和共享的文件夹，可能有不同的限制。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>使用量 %1 / %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<source>Currently there is no storage usage information available.</source>
<translation>目前没有储存使用量信息可用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>服务器动态</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>同步协议</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>忽视或错误的文件列表</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>复制动态列表到剪贴板。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>未同步</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>未同步 (%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>服务器动态已被复制到剪贴板。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>同步动态已被复制到剪贴板。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>未同步项已被复制到剪贴板。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>复制到剪贴板</translation>
</message>
<translation><br/>帐户%1没有同步活动。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation><numerusform>你收到 %n 新的通知来自于 %2.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation><numerusform>你收到 %n 新的通知来自 %1 和 %2。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation>你收到新的通知 %1， %2 和其它账户。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation>%1 通知 - 需要采取行动</translation>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation>向数据库写入元数据错误</translation>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation>用户撤销</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>本地文件夹 %1 不存在。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 应该是一个文件夹，但是它现在不是文件夹</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已移除。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已下载。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 已更名为 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已移动至 %2。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 和 %n 其它文件已被移除。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 和 %n 其它文件已下载。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 和 %n 其它文件已更新。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 已经更名为 %2，其它 %3 文件也已更名。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 已移动到 %2，其它 %3 文件也已移动。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 和 %n 其他文件有同步冲突。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 有同步冲突。请检查冲突文件！</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 和 %n 其他文件由于错误不能同步。详细信息请查看日志。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 同步出错。详情请查看日志。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>无法读取系统排除的文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>新文件夹 %2 添加成功，大于 %1 MB。
请前往设置选择是否下载。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>删除所有文件？</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
- <translation>本次同步将会重置同步文件夹 %1 下的所有文件。
-这可能是因为在服务器上的备份被恢复。
-继续同步将会导致所有你的文件被之前的状态覆盖，你是否保留本地的文件？</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation>备份已删除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation>正常同步</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation>保留本地文件为冲突文件</translation>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>不能重置文件夹状态</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation> (备份)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation> (备份 %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>上次同步已成功，不过一些文件出现了警告。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>用户撤销。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步已暂停)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>没有选择有效的文件夹！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>选择的路径不是一个文件夹！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>你没有写入所选文件夹的权限！</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation>剩余: %5，%1 / %2, 文件数量 %3 / %4</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>第 %1 个文件，共 %2 个</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>请稍等...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>等待 %n 个其他文件(文件夹)</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>准备同步...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>未能收到来自服务器的 E-Tag，请检查代理/网关</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>我们收到了不同的恢复 E-Tag，将在下次尝试。</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>服务器返回了错误的内容长度</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>连接超时</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>请输入账户 %2 的密码：
-
-用户: %2
-账户: %3</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>获取密钥链失败，错误: '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>输入密码</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>连接超时</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation>&电子邮件</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>连接到 %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>输入用户密码</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">成功连接到 %1：%2 版本 %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>连接到 %1 （%2）失败：<br />%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>连接到 %1 （%2） 时超时。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>尝试连接位于 %2 的 %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>被发送到服务器的认证请求被重定向到'%1'。此URL无效，服务器配置错误。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>对于一个验证的 webdav 请求，有一个无效的响应</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>服务器拒绝了访问。<a href="%1">点击这里打开浏览器</a> 来确认您是否有权访问。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>本地同步文件夹 %1 已存在，将使用它来同步。<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>创建本地同步目录%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>成功</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>失败</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>不能创建本地文件夹 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>未指定远程文件夹！</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>错误：%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>在 ownCloud 创建文件夹：%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>远程目录%1成功创建。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>远程文件夹 %1 已存在。连接它以供同步。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>创建文件夹出现 HTTP 错误代码 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>远程文件夹创建失败，因为提供的凭证有误！<br/>请返回并检查您的凭证。</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">远程文件夹创建失败，可能是由于提供的用户名密码不正确。</font><br/>请返回并检查它们。</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>创建远程文件夹 %1 失败，错误为 <tt>%2</tt>。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>已经设置了一个 %1 到远程文件夹 %2 的同步连接</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>成功连接到了 %1！</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>无法建立到 %1的链接，请稍后重试（这里“稍后”用对了，赞！）。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>文件夹更名失败</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>无法移除和备份文件夹，由于文件夹或文件正在被另一程序占用。请关闭程序后重试，或取消安装。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>本地同步目录 %1 已成功创建</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1 链接向导</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>跳过文件夹设置</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation>向数据库写入元数据错误</translation>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>由于本地文件名冲突，文件 %1 无法下载。</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>下载将会使用 %1 的磁盘空间</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>空闲磁盘空间少于 %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>已从服务器删除文件</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>文件无法完整下载。</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation>虽然服务器宣称已完成 %1，但实际下载文件为空。</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
- <translation>由于本地文件名冲突，文件 %1 无法保存。</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>自从发现文件以来，它已经被改变了</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
- <translation>向数据库写入元数据错误</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>由于本地文件名冲突，文件 %1 无法更名为 %2</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation>向数据库写入元数据错误</translation>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>文件无法更名，已经恢复为原文件名。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>文件无法更名，请改回“Shared”。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>文件已经更名，但这是某个只读分享的一部分，原文件已经恢复。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>服务器返回的 HTTP 状态错误，应返回 201，但返回的是“%1 %2”。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation>向数据库写入元数据错误</translation>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>已移除文件</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>本地文件在同步时已修改，完成后会再次同步</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>本地文件在同步时已修改。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation>Qt < 5.4.2 时强制中止连接重置。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>缺少轮询 URL</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>本地文件在同步时已删除。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>服务器未确认上一分块。(找不到 E-tag)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<source>Error writing metadata to the database</source>
- <translation>向数据库写入元数据错误</translation>
+ <translation type="unfinished"/>
</message>
</context>
<context>
<translation>ownCloud 路径：</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 分享</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>文件夹：%2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>服务器不支持共享</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation>从服务器获取最大可能的共享权限...</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>未分配共享权限，无法共享文件。</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>复制链接(&l)</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>允许编辑</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>密码保护(&a)</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>密码保护</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>未分配共享权限，无法共享文件。</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>公开分享需要密码</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>请设置密码</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>分享链接(&s)</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>登录错误</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync 在处理内部文件树时出错。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync 失败，内存不足。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync 致命参数错误。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>CSync 处理步骤更新失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync 处理步骤调和失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync 代理认证失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync 无法查询代理或服务器。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync 于 %1 服务器认证失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync 联网失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>网络连接超时。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP 传输错误。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>该文件夹在服务器上不可用</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>打开目录失败</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>读取目录时出错</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation>已忽略隐藏的文件和文件夹。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>仅有 %1 有效，至少需要 %2 才能开始</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync：%1 服务器空间已满。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync 未定义错误。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>用户撤销</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>文件包含无效字符无法跨平台同步。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>访问 CSync 失败</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>出于未处理的权限拒绝，CSync 失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync 尝试创建了已有的文件夹。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>服务暂时不可用</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>访问被拒绝</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>发生内部错误 %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>文件没有被同步因为之前的错误: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>符号链接不被同步支持。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>文件在忽略列表中。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>文件名过长。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>状态失败。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>文件名编码无效</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>无效的字符，请更改为 “%1”</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation>无法初始化同步日志</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation>无法从本地数据库读取黑名单</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation>无法读取同步日志。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>文件名中存在至少一个非法字符</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>已忽略（“选择同步内容”黑名单）</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>无法删除，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>本地文件和共享文件夹已被删除。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>无法移动，正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation>无法移动，%1为是只读的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>目标</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>源</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>版本 %1。详情请见 <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation><p>%1 使用GNU通用公共许可证 (GPL) 2.0。<br/>%2 以及 %2 标识已由 %1 注册使用。</p></translation>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>请登录</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>文件夹 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>没有已配置的同步文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>没有已配置的同步文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>在浏览器中打开</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>登录</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>注销</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>最近修改</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>检查 %1 的更改</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>管理的文件夹：</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>打开文件夹“%1”</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>在浏览器中打开%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>未知状态</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>设置...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>细节...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>帮助</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>退出 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>已从服务器断开 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation>不支持的服务器版本</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>账户 %1 的服务器运行着一个古老而不受支持的版本 %2。使用该客户端未支持的服务器版本未经测试并且可能存在潜在危险。继续操作需要自行承担风险。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>已断开账户: </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>账户 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation>帐户同步被禁用</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation>解除暂停所有文件夹</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation>暂停所有文件夹</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation>解除暂停所有同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation>解除暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation>暂停所有同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation>暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>注销所有账户</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>登录所有账户</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>发生了崩溃</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>近期没有项目被同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>同步 %2 中的 %1 (剩余 %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>同步 %1 (剩余 %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>更新</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>文本标签</translation>
</message>
<translation>开始全新同步 (将清空本地文件夹！)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>选择同步内容</translation>
</message>
<translation>同步服务器的所有内容 (&S)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>状态信息</translation>
</message>
<translation>窗体</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>用户名 (&U)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>密码 (&P)</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>错误标签</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>文本标签</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation>QT_LAYOUT_DIRECTION</translation>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation>将来</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation><numerusform>%n 天前</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation><numerusform>%n 小时前</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation>现在</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>刚刚</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation><numerusform>%n 分钟前</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>之前</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation><numerusform>%n 年</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation><numerusform>%n 月</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation><numerusform>%n 天</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation><numerusform>%n 小时</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation><numerusform>%n 分</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation><numerusform>%n 秒</numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>从 Git 版本 <a href="%1">%2</a> 在 %3 上构建， %4 使用了 Qt %5, %6</small></p></translation>
</message>
<translation>错误</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>未知</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>正在下载</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>正在上传</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>删除</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>移动</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>忽略</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>错误</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
<context>
<name>FileSystem</name>
<message>
- <location filename="../src/libsync/filesystem.cpp" line="273"/>
+ <location filename="../src/libsync/filesystem.cpp" line="274"/>
<source>The destination file has an unexpected size or modification time</source>
<translation>目的地的檔案大小或修改時間產生異常</translation>
</message>
<translation>未標示的資料夾將會從這台電腦被 <b>刪除</b> 而且不會再被同步到這台電腦 </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="193"/>
+ <location filename="../src/gui/accountsettings.ui" line="189"/>
+ <source>Synchronize all</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="196"/>
+ <source>Synchronize none</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="203"/>
+ <source>Apply manual changes</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="251"/>
<source>Apply</source>
<translation>套用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="180"/>
- <location filename="../src/gui/accountsettings.cpp" line="352"/>
- <location filename="../src/gui/accountsettings.cpp" line="690"/>
+ <location filename="../src/gui/accountsettings.ui" line="238"/>
+ <location filename="../src/gui/accountsettings.cpp" line="356"/>
+ <location filename="../src/gui/accountsettings.cpp" line="695"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
<translation>以 <user> 的身分連接 <server></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="127"/>
+ <location filename="../src/gui/accountsettings.cpp" line="131"/>
<source>No account configured.</source>
<translation>沒有設置帳號。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="141"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Add new</source>
<translation>新增</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="153"/>
<source>Remove</source>
<translation>移除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="153"/>
+ <location filename="../src/gui/accountsettings.cpp" line="157"/>
<source>Account</source>
<translation>帳號</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="221"/>
+ <location filename="../src/gui/accountsettings.cpp" line="225"/>
<source>Choose what to sync</source>
<translation>選擇要同步的項目</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="229"/>
+ <location filename="../src/gui/accountsettings.cpp" line="233"/>
<source>Remove folder sync connection</source>
<translation>移除資料夾同步連線</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="294"/>
+ <location filename="../src/gui/accountsettings.cpp" line="298"/>
<source>Folder creation failed</source>
<translation>資料夾建立失敗</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="295"/>
+ <location filename="../src/gui/accountsettings.cpp" line="299"/>
<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="345"/>
+ <location filename="../src/gui/accountsettings.cpp" line="349"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>確認移除資料夾同步連線</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="351"/>
+ <location filename="../src/gui/accountsettings.cpp" line="355"/>
<source>Remove Folder Sync Connection</source>
<translation>移除資料夾同步連線</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="433"/>
+ <location filename="../src/gui/accountsettings.cpp" line="437"/>
<source>Sync Running</source>
<translation>正在同步中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="434"/>
+ <location filename="../src/gui/accountsettings.cpp" line="438"/>
<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="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="505"/>
<source>%1 in use</source>
<translation>%1 正在使用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="521"/>
+ <location filename="../src/gui/accountsettings.cpp" line="525"/>
<source>%1 as <i>%2</i></source>
<translation>%1 如 <i>%2<i></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="527"/>
+ <location filename="../src/gui/accountsettings.cpp" line="531"/>
<source>The server version %1 is old and unsupported! Proceed at your own risk.</source>
<translation>伺服器版本%1過舊，已不支援。繼續的風險請自負。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="529"/>
+ <location filename="../src/gui/accountsettings.cpp" line="533"/>
<source>Connected to %1.</source>
<translation>已連線到 %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="531"/>
+ <location filename="../src/gui/accountsettings.cpp" line="535"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>伺服器 ％1 暫時無法使用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="533"/>
+ <location filename="../src/gui/accountsettings.cpp" line="537"/>
<source>Signed out from %1.</source>
<translation>從 %1 登出</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="535"/>
+ <location filename="../src/gui/accountsettings.cpp" line="539"/>
<source>No connection to %1 at %2.</source>
<translation>沒有從 %2 連線到 %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="558"/>
+ <location filename="../src/gui/accountsettings.cpp" line="562"/>
<source>Log in</source>
<translation>登入</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="642"/>
+ <location filename="../src/gui/accountsettings.cpp" line="645"/>
<source>There are new folders that were not synchronized because they are too big: </source>
<translation>有部份的資料夾因為容量太大沒有辦法同步:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="682"/>
+ <location filename="../src/gui/accountsettings.cpp" line="687"/>
<source>Confirm Account Removal</source>
<translation>確認移除帳號</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="683"/>
+ <location filename="../src/gui/accountsettings.cpp" line="688"/>
<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="689"/>
+ <location filename="../src/gui/accountsettings.cpp" line="694"/>
<source>Remove connection</source>
<translation>移除連線</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="217"/>
+ <location filename="../src/gui/accountsettings.cpp" line="221"/>
<source>Open folder</source>
<translation>開啟資料夾</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="145"/>
- <location filename="../src/gui/accountsettings.cpp" line="560"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
+ <location filename="../src/gui/accountsettings.cpp" line="564"/>
<source>Log out</source>
<translation>登出</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Resume sync</source>
<translation>繼續同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="226"/>
+ <location filename="../src/gui/accountsettings.cpp" line="230"/>
<source>Pause sync</source>
<translation>暫停同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="346"/>
+ <location filename="../src/gui/accountsettings.cpp" line="350"/>
<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="488"/>
+ <location filename="../src/gui/accountsettings.cpp" line="492"/>
<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="489"/>
+ <location filename="../src/gui/accountsettings.cpp" line="493"/>
<source>%1 of %2 in use</source>
<translation>已使用 %2 中的 %1%</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="498"/>
+ <location filename="../src/gui/accountsettings.cpp" line="502"/>
<source>Currently there is no storage usage information available.</source>
<translation>目前無法查詢儲存空間使用資訊。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="541"/>
+ <location filename="../src/gui/accountsettings.cpp" line="545"/>
<source>No %1 connection configured.</source>
<translation>沒有 %1 連線設置。</translation>
</message>
<context>
<name>OCC::ActivitySettings</name>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="516"/>
- <location filename="../src/gui/activitywidget.cpp" line="571"/>
+ <location filename="../src/gui/activitywidget.cpp" line="524"/>
+ <location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Server Activity</source>
<translation>伺服器活動</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="522"/>
+ <location filename="../src/gui/activitywidget.cpp" line="531"/>
<source>Sync Protocol</source>
<translation>同步協定</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="530"/>
+ <location filename="../src/gui/activitywidget.cpp" line="539"/>
<source>List of ignored or erroneous files</source>
<translation>被忽略或者錯誤的檔案列表</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="534"/>
+ <location filename="../src/gui/activitywidget.cpp" line="543"/>
<source>Copy</source>
<translation>複製</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="535"/>
+ <location filename="../src/gui/activitywidget.cpp" line="544"/>
<source>Copy the activity list to the clipboard.</source>
<translation>複製活動列表到剪貼簿。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="577"/>
+ <location filename="../src/gui/activitywidget.cpp" line="586"/>
<source>Not Synced</source>
<translation>尚未同步</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="580"/>
+ <location filename="../src/gui/activitywidget.cpp" line="589"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
<translation>未同步(%1)</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="596"/>
+ <location filename="../src/gui/activitywidget.cpp" line="612"/>
<source>The server activity list has been copied to the clipboard.</source>
<translation>伺服器活動列表已經被複製到剪貼簿。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="600"/>
+ <location filename="../src/gui/activitywidget.cpp" line="616"/>
<source>The sync activity list has been copied to the clipboard.</source>
<translation>同步活動列表已經被複製到剪貼簿。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="603"/>
+ <location filename="../src/gui/activitywidget.cpp" line="619"/>
<source>The list of unsynched items has been copied to the clipboard.</source>
<translation>未同步的清單已經被複製到剪貼簿。</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="608"/>
+ <location filename="../src/gui/activitywidget.cpp" line="624"/>
<source>Copied to clipboard</source>
<translation>複製至剪貼簿中</translation>
</message>
<translation><br/> 帳號 %1 尚未啟用紀錄行為功能</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <location filename="../src/gui/activitywidget.cpp" line="355"/>
<source>You received %n new notification(s) from %2.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <location filename="../src/gui/activitywidget.cpp" line="363"/>
<source>You received %n new notification(s) from %1 and %2.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="361"/>
+ <location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="365"/>
+ <location filename="../src/gui/activitywidget.cpp" line="369"/>
<source>%1 Notifications - Action Required</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::CleanupPollsJob</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="779"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="756"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::DiscoveryMainThread</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="540"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="571"/>
<source>Aborted by the user</source>
<translation>使用者中斷</translation>
</message>
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="129"/>
+ <location filename="../src/gui/folder.cpp" line="143"/>
<source>Local folder %1 does not exist.</source>
<translation>本地資料夾 %1 不存在</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="132"/>
+ <location filename="../src/gui/folder.cpp" line="146"/>
<source>%1 should be a folder but is not.</source>
<translation>資料夾不存在, %1 必須是資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="135"/>
+ <location filename="../src/gui/folder.cpp" line="149"/>
<source>%1 is not readable.</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="381"/>
+ <location filename="../src/gui/folder.cpp" line="352"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="491"/>
+ <location filename="../src/gui/folder.cpp" line="459"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被移除。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="498"/>
+ <location filename="../src/gui/folder.cpp" line="466"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被下載。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="505"/>
+ <location filename="../src/gui/folder.cpp" line="473"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="512"/>
+ <location filename="../src/gui/folder.cpp" line="480"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 已被重新命名為 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="519"/>
+ <location filename="../src/gui/folder.cpp" line="487"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已被搬移至 %2。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="489"/>
+ <location filename="../src/gui/folder.cpp" line="457"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="496"/>
+ <location filename="../src/gui/folder.cpp" line="464"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="503"/>
+ <location filename="../src/gui/folder.cpp" line="471"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="510"/>
+ <location filename="../src/gui/folder.cpp" line="478"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="517"/>
+ <location filename="../src/gui/folder.cpp" line="485"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="524"/>
+ <location filename="../src/gui/folder.cpp" line="492"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="526"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="531"/>
+ <location filename="../src/gui/folder.cpp" line="499"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="533"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 因為錯誤無法被同步。請從紀錄檔觀看細節。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="539"/>
+ <location filename="../src/gui/folder.cpp" line="507"/>
<source>Sync Activity</source>
<translation>同步活動</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="718"/>
<source>Could not read system exclude file</source>
<translation>無法讀取系統的排除檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="927"/>
<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="976"/>
+ <location filename="../src/gui/folder.cpp" line="960"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="964"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="966"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="967"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
- <source>This sync would reset the files to an erlier time in the sync folder '%1'.
+ <location filename="../src/gui/folder.cpp" line="983"/>
+ <source>This sync would reset the files to an earlier time in the sync folder '%1'.
This might be because a backup was restored on the server.
Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="988"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="990"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="991"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="269"/>
<source>Could not reset folder state</source>
<translation>無法重置資料夾狀態</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="266"/>
+ <location filename="../src/gui/folderman.cpp" line="270"/>
<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="927"/>
+ <location filename="../src/gui/folderman.cpp" line="961"/>
<source> (backup)</source>
<translation>（備份）</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="932"/>
+ <location filename="../src/gui/folderman.cpp" line="966"/>
<source> (backup %1)</source>
<translation>(備份 %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1139"/>
+ <location filename="../src/gui/folderman.cpp" line="1173"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1176"/>
<source>Waiting to start syncing.</source>
<translation>正在等待同步開始</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1179"/>
<source>Preparing for sync.</source>
<translation>正在準備同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1182"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1185"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1156"/>
+ <location filename="../src/gui/folderman.cpp" line="1190"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新一次的同步已經成功，但是有部份檔案有問題</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1159"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1162"/>
+ <location filename="../src/gui/folderman.cpp" line="1196"/>
<source>User Abort.</source>
<translation>使用者中斷。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1199"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1171"/>
+ <location filename="../src/gui/folderman.cpp" line="1205"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步暫停)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1179"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>No valid folder selected!</source>
<translation>沒有選擇有效的資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1190"/>
+ <location filename="../src/gui/folderman.cpp" line="1224"/>
<source>The selected path is not a folder!</source>
<translation>所選的路徑並非資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1194"/>
+ <location filename="../src/gui/folderman.cpp" line="1228"/>
<source>You have no permission to write to the selected folder!</source>
<translation>您沒有權限來寫入被選取的資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1209"/>
+ <location filename="../src/gui/folderman.cpp" line="1243"/>
<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="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1248"/>
<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="1221"/>
+ <location filename="../src/gui/folderman.cpp" line="1255"/>
<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="1228"/>
+ <location filename="../src/gui/folderman.cpp" line="1262"/>
<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="1234"/>
+ <location filename="../src/gui/folderman.cpp" line="1268"/>
<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>%1 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="947"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="949"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: "5 minutes left, 12 MB of 345 MB, file 6 of 7"</extracomment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="953"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="956"/>
+ <source>%1 of %2, file %3 of %4</source>
+ <extracomment>Example text: "12 MB of 345 MB, file 6 of 7"</extracomment>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="962"/>
<source>file %1 of %2</source>
<translation>檔案 %1 的 %2</translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="993"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1002"/>
<source>Waiting...</source>
<translation>等待中...</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folderstatusmodel.cpp" line="995"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1004"/>
<source>Waiting for %n other folder(s)...</source>
<translation><numerusform>正在等候 %n 的資料夾(可能不只一個)</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folderstatusmodel.cpp" line="1001"/>
+ <location filename="../src/gui/folderstatusmodel.cpp" line="1010"/>
<source>Preparing to sync...</source>
<translation>正在準備同步...</translation>
</message>
<context>
<name>OCC::GETFileJob</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="150"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="153"/>
<source>No E-Tag received from server, check Proxy/Gateway</source>
<translation>沒有收到來自伺服器的 E-Tag，請檢查代理伺服器或網路閘道</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="157"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="160"/>
<source>We received a different E-Tag for resuming. Retrying next time.</source>
<translation>在復原時收到了不同的 E-Tag，將在下一次重新嘗試取得</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="184"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="187"/>
<source>Server returned wrong content-range</source>
<translation>伺服器回應錯誤的內容長度</translation>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="295"/>
<source>Connection Timeout</source>
<translation>連線逾時</translation>
</message>
<context>
<name>OCC::HttpCredentialsGui</name>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="34"/>
- <source>Please enter %1 password:
-
-User: %2
-Account: %3
-</source>
- <translation>請輸入 %1 密碼:
-
-使用者: %2
-帳號: %3
-</translation>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="35"/>
+ <source>Please enter %1 password:<br><br>User: %2<br>Account: %3<br></source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="48"/>
<source>Reading from keychain failed with error: '%1'</source>
<translation>從授權碼讀取資料時失敗，錯誤: '%1'</translation>
</message>
<message>
- <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="53"/>
<source>Enter Password</source>
<translation>輸入密碼</translation>
</message>
+ <message>
+ <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="78"/>
+ <source><a href="%1">Click here</a> to request an app password from the web interface.</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>OCC::IgnoreListEditor</name>
<context>
<name>OCC::MoveJob</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="48"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="49"/>
<source>Connection timed out</source>
<translation>連線逾時</translation>
</message>
<context>
<name>OCC::OwncloudHttpCredsPage</name>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="50"/>
<source>&Email</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="60"/>
<source>Connect to %1</source>
<translation>連線到 %1</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="62"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
<source>Enter user credentials</source>
<translation>請輸入使用者憑證</translation>
</message>
<context>
<name>OCC::OwncloudSetupWizard</name>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="145"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="179"/>
<source><font color="green">Successfully connected to %1: %2 version %3 (%4)</font><br/><br/></source>
<translation><font color="green">成功連線到 %1: %2 版本 %3 (%4)</font><br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="169"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="205"/>
<source>Failed to connect to %1 at %2:<br/>%3</source>
<translation>從 %2 連線到 %1 失敗:<br/>%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="217"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>從 %2 嘗試連線到 %1 逾時。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="228"/>
<source>Trying to connect to %1 at %2...</source>
<translation>嘗試連線到%1從%2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="275"/>
<source>The authenticated request to the server was redirected to '%1'. The URL is bad, the server is misconfigured.</source>
<translation>伺服器要求的認證請求被導向 '%1'，這個URL可能不安全，此伺服器可能設定有錯。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="297"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>從webdav的認證要求中有無效的回傳值</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="288"/>
<source>Access forbidden by server. To verify that you have proper access, <a href="%1">click here</a> to access the service with your browser.</source>
<translation>從伺服器存取被拒絕。為了正確驗證您的存取資訊 <a href="%1">請點選這裡</a> 透過瀏覽器來存取服務</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
<source>Local sync folder %1 already exists, setting it up for sync.<br/><br/></source>
<translation>本地同步資料夾%1已存在, 將其設置為同步<br/><br/></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="341"/>
<source>Creating local sync folder %1...</source>
<translation>建立本地同步資料夾 %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="345"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="311"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="347"/>
<source>failed.</source>
<translation>失敗</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="313"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="349"/>
<source>Could not create local folder %1</source>
<translation>無法建立本地資料夾 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="338"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="374"/>
<source>No remote folder specified!</source>
<translation>沒有指定遠端資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="344"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="380"/>
<source>Error: %1</source>
<translation>錯誤： %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="357"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>creating folder on ownCloud: %1</source>
<translation>在 ownCloud 建立資料夾： %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="373"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="409"/>
<source>Remote folder %1 created successfully.</source>
<translation>遠端資料夾%1建立成功!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="375"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>遠端資料夾%1已存在,連線同步中</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="377"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="379"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="413"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="415"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>在HTTP建立資料夾失敗, error code %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="381"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="417"/>
<source>The remote folder creation failed because the provided credentials are wrong!<br/>Please go back and check your credentials.</p></source>
<translation>由於帳號或密碼錯誤，遠端資料夾建立失敗<br/>請檢查您的帳號密碼。</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="420"/>
<source><p><font color="red">Remote folder creation failed probably because the provided credentials are wrong.</font><br/>Please go back and check your credentials.</p></source>
<translation><p><font color="red">遠端資料夾建立失敗,也許是因為所提供的帳號密碼錯誤</font><br/>請重新檢查您的帳號密碼</p></translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="389"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="425"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="426"/>
<source>Remote folder %1 creation failed with error <tt>%2</tt>.</source>
<translation>建立遠端資料夾%1發生錯誤<tt>%2</tt>失敗</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="406"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="442"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>從%1到遠端資料夾%2的連線已建立</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="411"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>Successfully connected to %1!</source>
<translation>成功連接到 %1 ！</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="418"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="454"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>無法建立連線%1, 請重新檢查</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="431"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="467"/>
<source>Folder rename failed</source>
<translation>重新命名資料夾失敗</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="432"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
<source>Can't remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>無法移除與備份此資料夾，因為有其他的程式正在使用其中的資料夾或者檔案。請關閉使用中的資料夾或檔案並重試或者取消設定。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="474"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source><font color="green"><b>Local sync folder %1 successfully created!</b></font></source>
<translation><font color="green"><b>本地同步資料夾 %1 建立成功!</b></font></translation>
</message>
<context>
<name>OCC::OwncloudWizard</name>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="71"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="79"/>
<source>%1 Connection Wizard</source>
<translation>%1連線精靈</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudwizard.cpp" line="80"/>
+ <location filename="../src/gui/wizard/owncloudwizard.cpp" line="88"/>
<source>Skip folders configuration</source>
<translation>忽略資料夾設定資訊</translation>
</message>
<context>
<name>OCC::PropagateDirectory</name>
<message>
- <location filename="../src/libsync/owncloudpropagator.cpp" line="718"/>
+ <location filename="../src/libsync/owncloudpropagator.cpp" line="702"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateDownloadFileQNAM</name>
+ <name>OCC::PropagateDownloadFile</name>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="327"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="330"/>
<source>File %1 can not be downloaded because of a local file name clash!</source>
- <translation>檔案 %1 無法被下載，因為本地端的檔案名稱已毀損!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="376"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="379"/>
<source>The download would reduce free disk space below %1</source>
- <translation>這次下載將會減少硬碟空間: %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="381"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="384"/>
<source>Free space on disk is less than %1</source>
- <translation>可用的硬碟空間已經少於 %1</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="496"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="499"/>
<source>File was deleted from server</source>
- <translation>檔案已從伺服器被刪除</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="545"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="548"/>
<source>The file could not be downloaded completely.</source>
- <translation>檔案下載無法完成。</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="552"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="555"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="711"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="714"/>
<source>File %1 cannot be saved because of a local file name clash!</source>
- <translation>檔案 %1 無法存檔，因為本地端的檔案名稱已毀損!</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="759"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="762"/>
<source>File has changed since discovery</source>
- <translation>尋找的過程中檔案已經被更改</translation>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagatedownload.cpp" line="809"/>
+ <location filename="../src/libsync/propagatedownload.cpp" line="812"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<translation>檔案 %1 無法更名成 %2，因為本地端的檔案名稱已毀損</translation>
</message>
<message>
- <location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="246"/>
+ <location filename="../src/libsync/propagatorjobs.cpp" line="251"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::PropagateRemoteMove</name>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="87"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="88"/>
<source>This folder must not be renamed. It is renamed back to its original name.</source>
<translation>這個資料夾不應該被更名，他已經被改回原本的名稱了。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="89"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="90"/>
<source>This folder must not be renamed. Please name it back to Shared.</source>
<translation>這個資料夾已經被分享，不應該被更名，請改回原本的名稱。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="127"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="128"/>
<source>The file was renamed but is part of a read only share. The original file was restored.</source>
<translation>檔案更名完成，但這檔案是只供讀取的分享，原始檔案已被還原</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="145"/>
<source>Wrong HTTP code returned by server. Expected 201, but received "%1 %2".</source>
<translation>從伺服器端回傳錯誤的 HTTP 代碼， 預期是 201, 但是接收到的是 "%1 %2".</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="176"/>
+ <location filename="../src/libsync/propagateremotemove.cpp" line="182"/>
<source>Error writing metadata to the database</source>
<translation type="unfinished"/>
</message>
</context>
<context>
- <name>OCC::PropagateUploadFileQNAM</name>
+ <name>OCC::PropagateUploadFile</name>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="297"/>
<source>File Removed</source>
- <translation>檔案已移除</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="309"/>
<source>Local file changed during syncing. It will be resumed.</source>
- <translation>本地端的檔案在同步的過程中被更改，此檔案將會被還原。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="321"/>
<location filename="../src/libsync/propagateupload.cpp" line="710"/>
<source>Local file changed during sync.</source>
- <translation>本地端的檔案在同步過程中被更改。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="637"/>
<source>Forcing job abort on HTTP connection reset with Qt < 5.4.2.</source>
- <translation>HTTP連線工作被強制中斷，Qt版本< 5.4.2</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="645"/>
<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>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="676"/>
<source>Poll URL missing</source>
- <translation>缺少輪詢的超連結</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="699"/>
<source>The local file was removed during sync.</source>
- <translation>本地端的檔案在同步過程中被刪除。</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="725"/>
<source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
- <translation>伺服器不承認檔案的最後一個分割檔。(e-tag不存在)</translation>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="800"/>
<translation>ownCloud 路徑:</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="98"/>
+ <location filename="../src/gui/sharedialog.cpp" line="99"/>
<source>%1 Sharing</source>
<translation>%1 分享</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="73"/>
+ <location filename="../src/gui/sharedialog.cpp" line="74"/>
<source>%1</source>
<translation>%1</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="95"/>
+ <location filename="../src/gui/sharedialog.cpp" line="96"/>
<source>Folder: %2</source>
<translation>資料夾: %2</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="101"/>
+ <location filename="../src/gui/sharedialog.cpp" line="102"/>
<source>The server does not allow sharing</source>
<translation>伺服器不允許共享</translation>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="113"/>
+ <location filename="../src/gui/sharedialog.cpp" line="114"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/sharedialog.cpp" line="169"/>
+ <location filename="../src/gui/sharedialog.cpp" line="170"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>這個檔案無法被分享，並沒有分享此檔案的權限。</translation>
</message>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="201"/>
+ <source>&Mail link</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.ui" line="208"/>
<source>Copy &link</source>
<translation>複製連結</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.ui" line="225"/>
+ <location filename="../src/gui/sharelinkwidget.ui" line="232"/>
<source>Allow editing</source>
<translation>允許編輯</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="94"/>
<source>P&assword protect</source>
<translation>&密碼保護</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="196"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="202"/>
<source>Password Protected</source>
<translation>密碼保護</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="289"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="297"/>
<source>The file can not be shared because it was shared without sharing permission.</source>
<translation>這個檔案無法被分享，並沒有分享此檔案的權限。</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="366"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="413"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="376"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="424"/>
<source>Public sh&aring requires a password</source>
<translation>公開&共享需要密碼</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="435"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="447"/>
<source>Please Set Password</source>
<translation>請設定密碼</translation>
</message>
<message>
- <location filename="../src/gui/sharelinkwidget.cpp" line="500"/>
- <location filename="../src/gui/sharelinkwidget.cpp" line="501"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="503"/>
+ <source>Could not open email client</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="504"/>
+ <source>There was an error when launching the email client to create a new message. Maybe no default email client is configured?</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="532"/>
+ <location filename="../src/gui/sharelinkwidget.cpp" line="533"/>
<source>&Share link</source>
<translation>&分享連結</translation>
</message>
<context>
<name>OCC::ShibbolethCredentials</name>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<source>Login Error</source>
<translation>登入錯誤</translation>
</message>
<message>
- <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="235"/>
+ <location filename="../src/gui/creds/shibbolethcredentials.cpp" line="220"/>
<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="453"/>
+ <location filename="../src/gui/socketapi.cpp" line="455"/>
<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="118"/>
+ <location filename="../src/libsync/syncengine.cpp" line="126"/>
<source>Success.</source>
<translation>成功。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="125"/>
+ <location filename="../src/libsync/syncengine.cpp" line="133"/>
<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="128"/>
+ <location filename="../src/libsync/syncengine.cpp" line="136"/>
<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="131"/>
+ <location filename="../src/libsync/syncengine.cpp" line="139"/>
<source>CSync got an error while processing internal trees.</source>
<translation>CSync 處理內部資料樹時發生錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="134"/>
+ <location filename="../src/libsync/syncengine.cpp" line="142"/>
<source>CSync failed to reserve memory.</source>
<translation>CSync 無法取得記憶體空間。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="137"/>
+ <location filename="../src/libsync/syncengine.cpp" line="145"/>
<source>CSync fatal parameter error.</source>
<translation>CSync 參數錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="140"/>
+ <location filename="../src/libsync/syncengine.cpp" line="148"/>
<source>CSync processing step update failed.</source>
<translation>CSync 處理步驟 "update" 失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="143"/>
+ <location filename="../src/libsync/syncengine.cpp" line="151"/>
<source>CSync processing step reconcile failed.</source>
<translation>CSync 處理步驟 "reconcile" 失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="154"/>
<source>CSync could not authenticate at the proxy.</source>
<translation>CSync 無法在代理伺服器認證。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="149"/>
+ <location filename="../src/libsync/syncengine.cpp" line="157"/>
<source>CSync failed to lookup proxy or server.</source>
<translation>CSync 查詢代理伺服器或伺服器失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="152"/>
+ <location filename="../src/libsync/syncengine.cpp" line="160"/>
<source>CSync failed to authenticate at the %1 server.</source>
<translation>CSync 於伺服器 %1 認證失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="155"/>
+ <location filename="../src/libsync/syncengine.cpp" line="163"/>
<source>CSync failed to connect to the network.</source>
<translation>CSync 無法連接到網路。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="158"/>
+ <location filename="../src/libsync/syncengine.cpp" line="166"/>
<source>A network connection timeout happened.</source>
<translation>網路連線逾時。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="161"/>
+ <location filename="../src/libsync/syncengine.cpp" line="169"/>
<source>A HTTP transmission error happened.</source>
<translation>HTTP 傳輸錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="185"/>
+ <location filename="../src/libsync/syncengine.cpp" line="193"/>
<source>The mounted folder is temporarily not available on the server</source>
<translation>掛載的資料夾暫時無法在伺服器上使用</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="191"/>
+ <location filename="../src/libsync/syncengine.cpp" line="199"/>
<source>An error occurred while opening a folder</source>
<translation>開啟資料夾時發生錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="194"/>
+ <location filename="../src/libsync/syncengine.cpp" line="202"/>
<source>Error while reading folder.</source>
<translation>讀取資料夾時發生錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="440"/>
+ <location filename="../src/libsync/syncengine.cpp" line="449"/>
<source>File/Folder is ignored because it's hidden.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="701"/>
+ <location filename="../src/libsync/syncengine.cpp" line="714"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>目前僅有 %1 可以使用，至少需要 %2 才能開始</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1139"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1174"/>
<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="1146"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1181"/>
<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="173"/>
+ <location filename="../src/libsync/syncengine.cpp" line="181"/>
<source>CSync: No space on %1 server available.</source>
<translation>CSync：伺服器 %1 沒有可用空間。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="176"/>
+ <location filename="../src/libsync/syncengine.cpp" line="184"/>
<source>CSync unspecified error.</source>
<translation>CSync 未知的錯誤。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="179"/>
+ <location filename="../src/libsync/syncengine.cpp" line="187"/>
<source>Aborted by the user</source>
<translation>使用者中斷</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="434"/>
+ <location filename="../src/libsync/syncengine.cpp" line="440"/>
<source>Filename contains invalid characters that can not be synced cross platform.</source>
<translation>檔案名稱含有非法的字元符號導致無法跨平台同步。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="167"/>
+ <location filename="../src/libsync/syncengine.cpp" line="175"/>
<source>CSync failed to access</source>
<translation>CSync 存取失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="121"/>
+ <location filename="../src/libsync/syncengine.cpp" line="129"/>
<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="164"/>
+ <location filename="../src/libsync/syncengine.cpp" line="172"/>
<source>CSync failed due to unhandled permission denied.</source>
<translation>CSync 失敗，由於權限未處理被拒。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="170"/>
+ <location filename="../src/libsync/syncengine.cpp" line="178"/>
<source>CSync tried to create a folder that already exists.</source>
<translation>CSync 試圖建立一個已經存在的資料夾。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="182"/>
+ <location filename="../src/libsync/syncengine.cpp" line="190"/>
<source>The service is temporarily unavailable</source>
<translation>這個服務暫時無法使用。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="188"/>
+ <location filename="../src/libsync/syncengine.cpp" line="196"/>
<source>Access is forbidden</source>
<translation>存取被拒</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="199"/>
+ <location filename="../src/libsync/syncengine.cpp" line="207"/>
<source>An internal error number %1 occurred.</source>
<translation>發生內部錯誤，錯誤代碼 %1。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="263"/>
+ <location filename="../src/libsync/syncengine.cpp" line="271"/>
<source>The item is not synced because of previous errors: %1</source>
<translation>因為先前的錯誤: %1 物件沒有同步成功</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="428"/>
+ <location filename="../src/libsync/syncengine.cpp" line="434"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同步不支援捷徑連結</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="431"/>
+ <location filename="../src/libsync/syncengine.cpp" line="437"/>
<source>File is listed on the ignore list.</source>
<translation>檔案被列在忽略清單。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="437"/>
+ <location filename="../src/libsync/syncengine.cpp" line="443"/>
+ <source>Filename contains trailing spaces.</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/syncengine.cpp" line="446"/>
<source>Filename is too long.</source>
<translation>檔案名稱太長了。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="446"/>
+ <location filename="../src/libsync/syncengine.cpp" line="455"/>
<source>Stat failed.</source>
<translation>狀態失敗。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="473"/>
+ <location filename="../src/libsync/syncengine.cpp" line="482"/>
<source>Filename encoding is not valid</source>
<translation>檔案名稱編碼是無效的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="644"/>
+ <location filename="../src/libsync/syncengine.cpp" line="656"/>
<source>Invalid characters, please rename "%1"</source>
<translation>無效的字元，請您重新命名 "%1"</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="735"/>
+ <location filename="../src/libsync/syncengine.cpp" line="751"/>
<source>Unable to initialize a sync journal.</source>
<translation>同步處理日誌無法初始化</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="754"/>
+ <location filename="../src/libsync/syncengine.cpp" line="770"/>
<source>Unable to read the blacklist from the local database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="791"/>
+ <location filename="../src/libsync/syncengine.cpp" line="807"/>
<source>Unable to read from the sync journal.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="837"/>
+ <location filename="../src/libsync/syncengine.cpp" line="853"/>
<source>Cannot open the sync journal</source>
<translation>同步處理日誌無法開啟</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="894"/>
+ <location filename="../src/libsync/syncengine.cpp" line="910"/>
<source>File name contains at least one invalid character</source>
<translation>檔案名稱含有不合法的字元</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1098"/>
- <location filename="../src/libsync/syncengine.cpp" line="1105"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1133"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1140"/>
<source>Ignored because of the "choose what to sync" blacklist</source>
<translation>已忽略。根據 "選擇要同步的項目"的黑名單</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1124"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1159"/>
<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="1166"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1200"/>
<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="1183"/>
- <location filename="../src/libsync/syncengine.cpp" line="1203"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1235"/>
<source>Not allowed to remove, restoring</source>
<translation>不允許刪除，復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1216"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1248"/>
<source>Local files and share folder removed.</source>
<translation>本地端檔案和共享資料夾已被刪除。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1272"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1304"/>
<source>Move not allowed, item restored</source>
<translation>不允許移動，物件復原中</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1283"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1315"/>
<source>Move not allowed because %1 is read-only</source>
<translation>不允許移動，因為 %1 是唯讀的</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the destination</source>
<translation>目標</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1284"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1316"/>
<source>the source</source>
<translation>來源</translation>
</message>
<context>
<name>OCC::Theme</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="285"/>
+ <location filename="../src/libsync/theme.cpp" line="300"/>
<source><p>Version %1. For more information please visit <a href='%2'>%3</a>.</p></source>
<translation><p>版本 %1. 如欲得知更多資訊，請到此拜訪 <a href='%2'>%3</a>.</p></translation>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="289"/>
+ <location filename="../src/libsync/theme.cpp" line="304"/>
<source><p>Copyright ownCloud GmbH</p></source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/theme.cpp" line="290"/>
+ <location filename="../src/libsync/theme.cpp" line="305"/>
<source><p>Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.<br/>%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="292"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="293"/>
<source>Please sign in</source>
<translation>請登入</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="317"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="318"/>
<source>Folder %1: %2</source>
<translation>資料夾 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="322"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="323"/>
<source>No sync folders configured.</source>
<translation>尚未設置同步資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="332"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>There are no sync folders configured.</source>
<translation>尚未設置同步資料夾。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="340"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>用瀏覽器開啟</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="390"/>
- <location filename="../src/gui/owncloudgui.cpp" line="544"/>
- <location filename="../src/gui/owncloudgui.cpp" line="611"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="391"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="644"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="736"/>
<source>Log in...</source>
<translation>登入...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="394"/>
- <location filename="../src/gui/owncloudgui.cpp" line="536"/>
- <location filename="../src/gui/owncloudgui.cpp" line="613"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="395"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="636"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="738"/>
<source>Log out</source>
<translation>登出</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="415"/>
- <location filename="../src/gui/owncloudgui.cpp" line="456"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="467"/>
<source>Recent Changes</source>
<translation>最近的更動</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="656"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="781"/>
<source>Checking for changes in '%1'</source>
<translation>檢查 '%1' 的變動</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="367"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>管理的資料夾:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="370"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder '%1'</source>
<translation>開啟 %1 資料夾</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>瀏覽器中開啟 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="598"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="723"/>
<source>Unknown status</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="600"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="725"/>
<source>Settings...</source>
<translation>設定…</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="601"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="726"/>
<source>Details...</source>
<translation>細節…</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="606"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="731"/>
<source>Help</source>
<translation>說明</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="608"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="733"/>
<source>Quit %1</source>
<translation>離開 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="271"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="272"/>
<source>Disconnected from %1</source>
<translation>從 %1 斷線</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="236"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>Unsupported Server Version</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="237"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="238"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="275"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="276"/>
<source>Disconnected from accounts:</source>
<translation>已從帳號離線:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="278"/>
<source>Account %1: %2</source>
<translation>帳號 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="296"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="297"/>
<source>Account synchronization is disabled</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="379"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="380"/>
<source>Unpause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="384"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="385"/>
<source>Pause all folders</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="515"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="615"/>
<source>Unpause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="517"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="617"/>
<source>Unpause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="525"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="625"/>
<source>Pause all synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="527"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="627"/>
<source>Pause synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="534"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="634"/>
<source>Log out of all accounts</source>
<translation>登出所有的帳戶</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="542"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="642"/>
<source>Log in to all accounts...</source>
<translation>登入所有的帳戶</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="617"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="742"/>
<source>Crash now</source>
<comment>Only shows in debug mode to allow testing the crash handler</comment>
<translation>發生非預期結果</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="634"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="759"/>
<source>No items synced recently</source>
<translation>最近沒有項目被同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="661"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>同步中 %1 的 %2 (剩餘 %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="666"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
+ <source>Syncing %1 of %2</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
<source>Syncing %1 (%2 left)</source>
<translation>同步中 %1 (剩餘 %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="686"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="803"/>
+ <source>Syncing %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/owncloudgui.cpp" line="822"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Up to date</source>
<translation>最新的</translation>
</message>
<name>OCC::ownCloudTheme</name>
<message>
<location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
- <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.</p></source>
+ <source><p>Version %2. For more information visit <a href="%3">%4</a></p><p><small>By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.</small></p><p>Copyright ownCloud GmbH</p><p>Licensed under the GNU General Public License (GPL) Version 2.0<br/>ownCloud and the ownCloud Logo are registered trademarks of ownCloud GmbH in the United States, other countries, or both.</p></source>
<translation type="unfinished"/>
</message>
</context>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="78"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="131"/>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="247"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="285"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="312"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="335"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="291"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="318"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="341"/>
<source>TextLabel</source>
<translation>文字標籤</translation>
</message>
<translation>開始清除同步(將資料從本地端刪除)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="284"/>
<source>Choose what to sync</source>
<translation>選擇要同步的項目</translation>
</message>
<translation>從伺服器同步任何東西 (&Y)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="325"/>
<source>Status message</source>
<translation>狀態訊息</translation>
</message>
<translation>表單</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="38"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="70"/>
<source>&Username</source>
<translation>使用者名稱 (&U)</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="48"/>
+ <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="80"/>
<source>&Password</source>
<translation>密碼 (&P)</translation>
</message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="58"/>
- <source>Error Label</source>
- <translation>錯誤標籤</translation>
- </message>
- <message>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="112"/>
- <location filename="../src/gui/wizard/owncloudhttpcredspage.ui" line="125"/>
- <source>TextLabel</source>
- <translation>文字標籤</translation>
- </message>
</context>
<context>
<name>OwncloudSetupPage</name>
<context>
<name>QApplication</name>
<message>
- <location filename="../src/gui/application.cpp" line="599"/>
+ <location filename="../src/gui/application.cpp" line="605"/>
<source>QT_LAYOUT_DIRECTION</source>
<translation type="unfinished"/>
</message>
<context>
<name>QObject</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="473"/>
+ <location filename="../src/libsync/utility.cpp" line="500"/>
<source>in the future</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="469"/>
+ <location filename="../src/libsync/utility.cpp" line="496"/>
<source>%n day(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="477"/>
+ <location filename="../src/libsync/utility.cpp" line="504"/>
<source>%n hour(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="482"/>
+ <location filename="../src/libsync/utility.cpp" line="509"/>
<source>now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="484"/>
+ <location filename="../src/libsync/utility.cpp" line="511"/>
<source>Less than a minute ago</source>
<translation>不到一分鐘前</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="487"/>
+ <location filename="../src/libsync/utility.cpp" line="514"/>
<source>%n minute(s) ago</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="490"/>
+ <location filename="../src/libsync/utility.cpp" line="517"/>
<source>Some time ago</source>
<translation>前一段時間</translation>
</message>
<context>
<name>Utility</name>
<message>
- <location filename="../src/libsync/utility.cpp" line="125"/>
+ <location filename="../src/libsync/utility.cpp" line="133"/>
<source>%L1 GB</source>
<translation>%L1 GB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="129"/>
+ <location filename="../src/libsync/utility.cpp" line="137"/>
<source>%L1 MB</source>
<translation>%L1 MB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="132"/>
+ <location filename="../src/libsync/utility.cpp" line="140"/>
<source>%L1 KB</source>
<translation>%L1 KB</translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="135"/>
+ <location filename="../src/libsync/utility.cpp" line="143"/>
<source>%L1 B</source>
<translation>%L1 B</translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="319"/>
+ <location filename="../src/libsync/utility.cpp" line="327"/>
<source>%n year(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="320"/>
+ <location filename="../src/libsync/utility.cpp" line="328"/>
<source>%n month(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="321"/>
+ <location filename="../src/libsync/utility.cpp" line="329"/>
<source>%n day(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="322"/>
+ <location filename="../src/libsync/utility.cpp" line="330"/>
<source>%n hour(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="323"/>
+ <location filename="../src/libsync/utility.cpp" line="331"/>
<source>%n minute(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/libsync/utility.cpp" line="324"/>
+ <location filename="../src/libsync/utility.cpp" line="332"/>
<source>%n second(s)</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/libsync/utility.cpp" line="348"/>
+ <location filename="../src/libsync/utility.cpp" line="356"/>
<source>%1 %2</source>
<translation>%1 %2</translation>
</message>
<context>
<name>ownCloudTheme::about()</name>
<message>
- <location filename="../src/libsync/theme.cpp" line="271"/>
+ <location filename="../src/libsync/theme.cpp" line="286"/>
<source><p><small>Built from Git revision <a href="%1">%2</a> on %3, %4 using Qt %5, %6</small></p></source>
<translation><p><small>根據Git版本號<a href="%1">%2</a>在 %3建置， %4 使用了Qt %5，%6</small></p></translation>
</message>
<translation>錯誤</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="51"/>
- <location filename="../src/libsync/progressdispatcher.cpp" line="54"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="50"/>
+ <source>Updated local metadata</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="53"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="56"/>
<source>Unknown</source>
<translation>未知</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="65"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
<source>downloading</source>
<translation>下載中</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="67"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
<source>uploading</source>
<translation>上傳中</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="69"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="71"/>
<source>deleting</source>
<translation>刪除中</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="72"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
<source>moving</source>
<translation>搬移中</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="74"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<source>ignoring</source>
<translation>忽略中</translation>
</message>
<message>
- <location filename="../src/libsync/progressdispatcher.cpp" line="76"/>
<location filename="../src/libsync/progressdispatcher.cpp" line="78"/>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="80"/>
<source>error</source>
<translation>錯誤</translation>
</message>
+ <message>
+ <location filename="../src/libsync/progressdispatcher.cpp" line="82"/>
+ <source>updating local metadata</source>
+ <translation type="unfinished"/>
+ </message>
</context>
<context>
<name>theme</name>
projects / nextcloud-desktop.git / commitdiff