Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins for ownCloud <owncloud-bot@tmit.eu>2015-08-25 09:19:17 +0300
committerJenkins for ownCloud <owncloud-bot@tmit.eu>2015-08-25 09:19:17 +0300
commit3db0db451e5c097b9b45dcc32f157760a8c16665 (patch)
tree7c56c87ae9258cf3ee21a716158e519dd0cbd521 /translations
parent035e57cf37e4218ee1196e6f6c00a0803b8d8d88 (diff)
[tx-robot] updated from transifex
Diffstat (limited to 'translations')
-rw-r--r--translations/client_ca.ts116
-rw-r--r--translations/client_cs.ts122
-rw-r--r--translations/client_de.ts116
-rw-r--r--translations/client_el.ts116
-rw-r--r--translations/client_en.ts114
-rw-r--r--translations/client_es.ts116
-rw-r--r--translations/client_es_AR.ts114
-rw-r--r--translations/client_et.ts116
-rw-r--r--translations/client_eu.ts116
-rw-r--r--translations/client_fa.ts114
-rw-r--r--translations/client_fi.ts116
-rw-r--r--translations/client_fr.ts116
-rw-r--r--translations/client_gl.ts116
-rw-r--r--translations/client_hu.ts114
-rw-r--r--translations/client_it.ts116
-rw-r--r--translations/client_ja.ts116
-rw-r--r--translations/client_nb_NO.ts116
-rw-r--r--translations/client_nl.ts116
-rw-r--r--translations/client_pl.ts116
-rw-r--r--translations/client_pt.ts116
-rw-r--r--translations/client_pt_BR.ts116
-rw-r--r--translations/client_ru.ts116
-rw-r--r--translations/client_sk.ts116
-rw-r--r--translations/client_sl.ts116
-rw-r--r--translations/client_sr.ts116
-rw-r--r--translations/client_sv.ts116
-rw-r--r--translations/client_th.ts116
-rw-r--r--translations/client_tr.ts116
-rw-r--r--translations/client_uk.ts116
-rw-r--r--translations/client_zh_CN.ts116
-rw-r--r--translations/client_zh_TW.ts116
31 files changed, 2138 insertions, 1456 deletions
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index 54c02d552..b510d8ad0 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -89,22 +89,29 @@
<translation>Esborra</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>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.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Les carpetes desmarcades &lt;b&gt;s&apos;eliminaran&lt;/b&gt; del vostre sistema de fitxers local i ja no es sincronitzaran en aquest ordinador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Aplica</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Cancel·la</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Connectat amb &lt;server&gt; com a &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>No hi ha cap compte configurat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Elimina la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Ha fallat la creació de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;No s&apos;ha pogut crear la carpeta local &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Confirma l&apos;eliminació de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Confirmeu la reinicialització de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Voleu reiniciar la carpeta &lt;i&gt;%1&lt;/i&gt; i reconstruir la base de dades del client?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Aquesta funció existeix només per tasques de manteniment. Cap fitxer no s&apos;eliminarà, però podria provocar-se un transit de dades significant i podria trigar diversos minuts o hores en completar-se, depenent de la mida de la carpeta. Utilitzeu aquesta opció només si us ho recomana l&apos;administrador.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>S&apos;està sincronitzant</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>S&apos;està sincronitzant.&lt;br/&gt;Voleu parar-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 com a &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Connectat a %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<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="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>S&apos;ha desconnectat de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<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="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Hi ha carpetes noves que no s&apos;han pogut sincronitzar perquè són massa grans: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Confirmeu l&apos;eliminació del compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Segur que voleu eliminar la connexió al compte &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; això &lt;b&gt;no&lt;/b&gt; esborrarà cap fitxer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) de %2 l&apos;espai del servidor en ús.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Obre la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Continua la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Pausa la sincronització</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Segur que voleu aturar la sincronització de la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; això &lt;b&gt;no&lt;/b&gt; esborrarà cap fitxer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualment no hi ha informació disponible de l&apos;ús d&apos;emmagatzemament.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>La connexió %1 no està configurada.</translation>
</message>
@@ -752,8 +769,8 @@ Temps restant total %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Afegeix una carpeta</translation>
</message>
@@ -819,22 +836,27 @@ Temps restant total %5</translation>
<translation>No s&apos;ha pogut crear el directori en %1. Si us plau, comproveu-lo manualment.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Escolliu-ho per sincronitzar el compte sencer</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Ja s&apos;està sincronitzant aquest directori.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ja esteu sincronitzant &lt;i&gt;%1&lt;/i&gt;, que és una carpeta dins de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Ja esteu sincronitzant tots els vostres fitxers. Sincronitzar una altra carpeta &lt;b&gt;no&lt;/b&gt; està permes. Si voleu sincronitzar múltiples carpetes, elimineu la configuració de sincronització de la carpeta arrel.</translation>
</message>
@@ -842,7 +864,7 @@ Temps restant total %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Trieu què sincronitzar: podeu seleccionar opcionalment quines subcarpetes remotes no voleu sincronitzar.</translation>
</message>
@@ -1376,8 +1398,8 @@ privilegis addicionals durant el procés.</translation>
<translation>Fitxer local de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1986,22 +2008,22 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Les carpetes desmarcades &lt;b&gt;s&apos;eliminaran&lt;/b&gt; del vostre sistema de fitxers local i ja no es sincronitzaran en aquest ordinador</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Trieu què sincronitzar: seleccioneu subcarpetes remotes que voleu sincronitzar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Trieu què sincronitzar: desseleccioneu subcarpetes remotes que no voleu sincronitzar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Trieu què sincronitzar</translation>
</message>
@@ -2024,13 +2046,13 @@ No és aconsellada usar-la.</translation>
<translation>Mida</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Actualment no hi ha subcarpetes al servidor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>S&apos;ha produit un error en carregar la llista de subcarpetes.</translation>
</message>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 61d126cd2..7d895f310 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -89,22 +89,29 @@
<translation>Smazat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Některé adresáře, včetně připojených síťových nebo sdílených, mohou mít rozdílné limity.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neoznačené složky budou &lt;b&gt;odstraněny&lt;/b&gt; 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="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Použít</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Zrušit</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Připojen k &lt;server&gt; jako &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Žádný účet nenastaven.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Odstranit adresář</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Vytvoření adresáře selhalo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Nelze vytvořit místní adresář &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdit odstranění složky</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdit restartování složky</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Skutečně chcete resetovat složku &lt;i&gt;%1&lt;/i&gt; a znovu sestavit klientskou databázi?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Tato funkce je určena pouze pro účely údržby. Žádné soubory nebudou smazány, ale může to způsobit velké datové přenosy a dokončení může trvat mnoho minut či hodin v závislosti na množství dat ve složce. Použijte tuto volbu pouze na pokyn správce.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Synchronizace probíhá</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Operace synchronizace právě probíhá.&lt;br/&gt;Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 jako &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Připojeno k %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 je dočasně nedostupný.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Odhlášeno z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<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="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Jsou dostupné nové adresáře, které nebyly synchronizovány z důvodu jejich nadměrné velikosti: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Potvrdit smazání účtu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;p&gt;Opravdu chcete odstranit připojení k účtu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Toto &lt;b&gt;neodstraní&lt;/b&gt; žádné soubory.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) z %2 místa na disku použito.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Otevřít adresář</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Pokračovat v synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Pozastavit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;p&gt;Opravdu chcete zastavit synchronizaci adresáře &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Toto &lt;b&gt;neodstraní&lt;/b&gt; žádné soubory.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
@@ -691,7 +708,7 @@ Opravdu chcete provést tuto akci?</translation>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="152"/>
<source>Error while loading the list of folders from the server.</source>
- <translation type="unfinished"/>
+ <translation>Chyba při načítání seznamu adresářů ze serveru.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="681"/>
@@ -751,8 +768,8 @@ Celkový zbývající čas %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Přidat složku</translation>
</message>
@@ -818,22 +835,27 @@ Celkový zbývající čas %5</translation>
<translation>Na %1 selhalo vytvoření složky. Zkontrolujte to, prosím, ručně.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Zvolte toto k provedení synchronizace celého účtu</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Tato složka je již synchronizována.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Již synchronizujete složku &lt;i&gt;%1&lt;/i&gt;, která je složce &lt;i&gt;%2&lt;/i&gt; nadřazená.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Již synchronizujete všechny své soubory. Synchronizování další složky &lt;b&gt;není&lt;/b&gt; podporováno. Pokud chcete synchronizovat více složek, odstraňte prosím synchronizaci aktuální kořenové složky.</translation>
</message>
@@ -841,7 +863,7 @@ Celkový zbývající čas %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Výběr synchronizace: Můžete dodatečně označit podsložky, které si nepřejete synchronizovat.</translation>
</message>
@@ -1375,8 +1397,8 @@ můžete být požádáni o dodatečná oprávnění.</translation>
<translation>Místní synchronizovaná složka</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1991,22 +2013,22 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neoznačené složky budou &lt;b&gt;odstraněny&lt;/b&gt; z místního souborového systému a nebudou již synchronizovány na tento počítač</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Výběr synchronizace: Označte vzdálené podsložky, které si přejete synchronizovat.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Výběr synchronizace: Odznačte vzdálené podsložky, které si nepřejete synchronizovat.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Vybrat co synchronizovat</translation>
</message>
@@ -2029,13 +2051,13 @@ Nedoporučuje se jí používat.</translation>
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Na serveru nejsou momentálně žádné podadresáře.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Došlo k chybě v průběhu načítání seznamu podadresářů.</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 7c8361289..8d3113450 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -89,22 +89,29 @@
<translation>Löschen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Nicht markierte Ordner werden von Ihrem lokalen Dateisystem &lt;b&gt;entfernt&lt;/b&gt; und werden auch nicht mehr auf diesem Rechner synchronisiert</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Anwenden</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
@@ -114,128 +121,138 @@
<translation>Verbunden mit &lt;server&gt; als &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Kein Konto konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Löschen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Zurücksetzen des Ordners bestätigen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Soll Ordner &lt;i&gt;%1&lt;/i&gt; wirklich zurückgesetzt und die Datenbank auf dem Client neu aufgebaut werden?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Hinweis:&lt;/b&gt;
Diese Funktion ist nur für Wartungszwecke gedacht. Es werden keine Dateien entfernt, jedoch kann diese Aktion erheblichen Datenverkehr verursachen und je nach Größe des Ordnerinhalts mehrere Minuten oder Stunden in Anspruch nehmen. Verwenden Sie diese Funktion nur dann, wenn Ihr Administrator Sie ausdrücklich dazu auffordert.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Synchronisation läuft</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Die Synchronisation läuft gerade.&lt;br/&gt;Wollen Sie sie beenden?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) von %2 Serverkapazität in Benutzung.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Ordner öffnen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Synchronisation fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Synchronisation pausieren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
@@ -751,8 +768,8 @@ Gesamtzeit übrig %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Ordner hinzufügen</translation>
</message>
@@ -818,22 +835,27 @@ Gesamtzeit übrig %5</translation>
<translation>Die Erstellung des Ordners auf %1 ist fehlgeschlagen. Bitte prüfen Sie dies manuell.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Wählen Sie dies, um das gesamte Konto zu synchronisieren</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Dieser Ordner wird bereits synchronisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Sie synchronisieren bereits &lt;i&gt;%1&lt;/i&gt;, das ein übergeordneten Ordner von &lt;i&gt;%2&lt;/i&gt; ist.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Sie synchronisieren bereits alle Ihre Dateien. Die Synchronisation anderer Verzeichnisse wird &lt;b&gt;nicht&lt;/b&gt; unterstützt. Wenn Sie mehrere Ordner synchronisieren möchten, entfernen Sie bitte das aktuell konfigurierte Wurzelverzeichnis zur Synchronisation.</translation>
</message>
@@ -841,7 +863,7 @@ Gesamtzeit übrig %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Zu synchronisierende Elemente auswählen: Sie können optional Unterordner des Servers abwählen, die nicht synchronisiert werden sollen.</translation>
</message>
@@ -1368,8 +1390,8 @@ for additional privileges during the process.</source>
<translation>Lokaler Ordner für die Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1983,22 +2005,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Nicht markierte Ordner werden von Ihrem lokalen Dateisystem &lt;b&gt;entfernt&lt;/b&gt; und werden auch nicht mehr auf diesem Rechner synchronisiert</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Zu synchronisierende Elemente auswählen: Sie können Unterordner des Servers auswählen, die synchronisiert werden sollen.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Zu synchronisierende Elemente auswählen: Sie können Unterordner des Servers abwählen, die nicht synchronisiert werden sollen.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Zu synchronisierende Elemente auswählen</translation>
</message>
@@ -2021,13 +2043,13 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>Größe</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Aktuell befinden sich keine Unterordner auf dem Server.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Ein Fehler ist aufgetreten, während die Liste der Unterordner geladen wurde.</translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index a0d4f81d2..4f40f0569 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -89,22 +89,29 @@
<translation>Διαγραφή</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Κάποιοι φάκελοι, συμπεριλαμβανομένων των δικτυακών δίσκων ή των κοινόχρηστων φακέλων, μπορεί να έχουν διαφορετικά όρια. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Οι μη επιλεγμένοι φάκελοι θα &lt;b&gt;αφαιρεθούν&lt;/ b&gt; από το τοπικό σύστημα αρχείων σας και δεν θα συγχρονιστούν πια με αυτόν τον υπολογιστή</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Εφαρμογή</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Άκυρο</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Συνδεδεμένοι με το &lt;server&gt; ως &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Δεν ρυθμίστηκε λογαριασμός.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Αφαίρεση φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Αποτυχία αφαίρεσης φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Αδυναμία δημιουργίας τοπικού φακέλου &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Επιβεβαίωση Αφαίρεσης Φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Επιβεβαίωση Επαναφοράς Φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Θέλετε στ&apos; αλήθεια να επαναφέρετε το φάκελο &lt;i&gt;%1&lt;/i&gt; και να επαναδημιουργήσετε τη βάση δεδομένων του δέκτη;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτή η λειτουργία έχει σχεδιαστεί αποκλειστικά για λόγους συντήρησης. Κανένα αρχείο δεν θα αφαιρεθεί, αλλά αυτό μπορεί να προκαλέσει σημαντική κίνηση δεδομένων και να πάρει αρκετά λεπτά ή ώρες μέχρι να ολοκληρωθεί, ανάλογα με το μέγεθος του φακέλου. Χρησιμοποιείστε αυτή την επιλογή μόνο εάν έχετε συμβουλευτεί αναλόγως από το διαχειριστή σας.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Εκτελείται Συγχρονισμός </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Η λειτουργία συγχρονισμού εκτελείται.&lt;br/&gt; Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 ως &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Συνδεδεμένο με %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Ο διακομιστής %1 δεν είναι διαθέσιμος προσωρινά.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Αποσυνδέθηκε από %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation>Δεν υπάρχει σύνδεση με το %1 στο %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Υπάρχουν νέοι φάκελοι που δεν συγχρονίσθηκαν επειδή είναι πολυ μεγάλοι: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Επιβεβαίωση Διαγραφής Λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Θέλετε πραγματικά να αφαιρέσετε τη σύνδεση με το λογαριασμό &lt;i&gt;%1&lt;/i&gt;;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτό &lt;b&gt;δεν&lt;/b&gt; θα διαγράψει κανένα αρχείο.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) από %2 αποθηκευτικός χώρος διακομιστή σε χρήση.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Άνοιγμα φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Συνέχιση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Παύση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Θέλετε πραγματικά να σταματήσετε το συγχρονισμό του φακέλου &lt;i&gt;%1&lt;/i&gt;;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτό &lt;b&gt;δεν&lt;/b&gt; θα διαγράψει κανένα αρχείο.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation>
</message>
@@ -752,8 +769,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Προσθήκη Φακέλου</translation>
</message>
@@ -819,22 +836,27 @@ Total time left %5</source>
<translation>Αποτυχία δημιουργίας φακέλου στο %1. Παρακαλώ ελέγξτε χειροκίνητα.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Επιλέξτε να συγχρονίσετε ολόκληρο το λογαριασμό</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Αυτός ο φάκελος συγχρονίζεται ήδη.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ο φάκελος &lt;i&gt;%1&lt;/i&gt;, ο οποίος είναι γονεϊκός φάκελος του &lt;i&gt;%2&lt;/i&gt;, συγχρονίζεται ήδη.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Συγχρονίζετε ήδη όλα σας τα αρχεία. Ο συγχρονισμός ενός ακόμα φακέλου &lt;b&gt;δεν&lt;/b&gt; υποστηρίζεται. Εάν θέλετε να συγχρονίσετε πολλαπλούς φακέλους, παρακαλώ αφαιρέστε την τρέχουσα ρύθμιση συχρονισμού του βασικού φακέλου.</translation>
</message>
@@ -842,7 +864,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Επιλέξτε Τι θα Συγχρονιστεί: Μπορείτε προαιρετικά να καταργήστε την επιλογή υποφακέλων που δεν επιθυμείτε να συγχρονίσετε.</translation>
</message>
@@ -1376,8 +1398,8 @@ for additional privileges during the process.</source>
<translation>Τοπικός Φάκελος Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1992,22 +2014,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Οι μη επιλεγμένοι φάκελοι θα &lt;b&gt;αφαιρεθούν&lt;/ b&gt; από το τοπικό σύστημα αρχείων σας και δεν θα συγχρονιστούν πια με αυτόν τον υπολογιστή</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Επιλέξτε Τι θα Συγχρονιστεί: Επιλέξτε τους απομακρυσμένους υποφακέλους που επιθυμείτε να συγχρονίσετε.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Επιλέξτε Τι θα Συγχρονιστεί: Επιλέξτε τους απομακρυσμένους υποφακέλους που δεν επιθυμείτε να συγχρονίσετε.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Επιλέξτε Τι θα Συγχρονιστεί</translation>
</message>
@@ -2030,13 +2052,13 @@ It is not advisable to use it.</source>
<translation>Μέγεθος</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Δεν υπάρχουν υποφάκελοι αυτή τη στιγμή στον διακομιστή.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Προέκυψε σφάλμα κατά τη φόρτωση της λίστας υποφακέλων.</translation>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 86fb1df93..488e6da1d 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -91,22 +91,29 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation type="unfinished"></translation>
</message>
@@ -116,127 +123,137 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation type="unfinished"></translation>
</message>
@@ -749,8 +766,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation type="unfinished"></translation>
</message>
@@ -816,22 +833,27 @@ Total time left %5</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation type="unfinished"></translation>
</message>
@@ -839,7 +861,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"></translation>
</message>
@@ -1366,8 +1388,8 @@ for additional privileges during the process.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation type="unfinished"></translation>
</message>
@@ -1981,22 +2003,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation type="unfinished"></translation>
</message>
@@ -2019,13 +2041,13 @@ It is not advisable to use it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"></translation>
</message>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index 0f5607f7f..373c2febc 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -89,22 +89,29 @@
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Algunas carpetas, incluyendo redes montadas o carpetas compartidas, pueden tener diferentes límites.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no seleccionadas serán &lt;b&gt;eliminadas&lt;/b&gt; de su sistema de archivos local y ya no serán sincronizadas con esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Conectado a &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>No se ha configurado ninguna cuenta.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Eliminar carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Creación de carpeta falló</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;No se pudo crear la carpeta local &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar la eliminación de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Confirme que desea restablecer la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente desea restablecer la carpeta &lt;i&gt;%1&lt;/i&gt; y reconstruir la base de datos de cliente?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esta función es para mantenimiento únicamente. No se eliminarán archivos, pero se puede causar alto tráfico en la red y puede tomar varios minutos u horas para terminar, dependiendo del tamaño de la carpeta. Únicamente utilice esta opción si así lo indica su administrador.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La sincronización está en curso.&lt;br/&gt;¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Servidor %1 no está disponible temporalmente.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Cerró sesión desde %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<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="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Hay carpetas que no fueron sincronizadas debido a que son demasiado grandes: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Confirmar eliminación de cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) de %2 espacio usado en el servidor.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -751,8 +768,8 @@ Tiempo restante %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Añadir carpeta</translation>
</message>
@@ -818,22 +835,27 @@ Tiempo restante %5</translation>
<translation>Fallo al crear la carpeta %1. Por favor, revíselo manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Elija esto para sincronizar la cuenta entera</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Este directorio ya se ha sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya ha sincronizado &lt;i&gt;%1&lt;/i&gt;, el cual es la carpeta de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Todavía se están sincronizando ficheros. &lt;b&gt;No&lt;/b&gt; se admite la sincronización de otras carpetas. Si quiere sincronizar múltiples carpetas, por favor revise la carpeta raíz configurada.</translation>
</message>
@@ -841,7 +863,7 @@ Tiempo restante %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Elija qué sinconizar: Opcionalmente puede deseleccionar subcarpetas remotas que no desee sincronizar</translation>
</message>
@@ -1374,8 +1396,8 @@ for additional privileges during the process.</source>
<translation>Carpeta local de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1987,22 +2009,22 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Las carpetas no seleccionadas serán &lt;b&gt;eliminadas&lt;/b&gt; de su sistema de archivos local y ya no serán sincronizadas con esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Elija qué sincronizar: seleccione las subcarpetas remotas que desea sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Elija qué sincronizar: desmarque las subcarpetas remotas que no desea sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Escoja qué sincronizar</translation>
</message>
@@ -2025,13 +2047,13 @@ No se recomienda usarla.</translation>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>No hay subcarpetas actualmente en el servidor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Ocurrió un error cuando se cargaba la lista de subcarpetas.</translation>
</message>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index 0ab66a3b5..ba0bb108c 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -89,22 +89,29 @@
<translation>Borrar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>No hay cuenta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Confirmá la eliminación del directorio</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Confirme el reseteo de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿Realmente deseas resetear el directorio &lt;i&gt;%1&lt;/i&gt; y reconstruir la base de datos del cliente?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esta función está designada para propósitos de mantenimiento solamente. Ningún archivo será eliminado, pero puede causar un tráfico de datos significante y tomar varios minutos o horas para completarse, dependiendo del tamaño del directorio. Sólo use esta opción si es aconsejado por su administrador.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La sincronización está en curso.&lt;br/&gt;¿Querés interrumpirla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -749,8 +766,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>gregar directorio</translation>
</message>
@@ -816,22 +833,27 @@ Total time left %5</source>
<translation>Fallo al crear el directorio en %1. Por favor chequee manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Seleccioná acá para sincronizar la cuenta completa</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Este folder ya está siendo sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Ya estás sincronizando &lt;i&gt;%1&lt;/i&gt;, el cual es el directorio de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation type="unfinished"/>
</message>
@@ -839,7 +861,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
@@ -1366,8 +1388,8 @@ for additional privileges during the process.</source>
<translation>Directorio local de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation type="unfinished"/>
</message>
@@ -1975,22 +1997,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation type="unfinished"/>
</message>
@@ -2013,13 +2035,13 @@ It is not advisable to use it.</source>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index 8e2c493e4..0aa33c1ba 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -89,22 +89,29 @@
<translation>Kustuta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Märkimata kataloogid &lt;b&gt;eemaldatakse&lt;/b&gt; kohalikust failisüsteemist ning neid ei sünkroniseerita enam sellesse arvutisse</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Rakenda</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Loobu</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Ühendatud &lt;server&gt; kasutajana &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Ühtegi kontot pole seadistatud</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Eemalda kaust</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Kausta loomine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Kinnita kausta eemaldamist</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Kinnita kataloogi algseadistus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Kas tõesti soovid kataloogi &lt;i&gt;%1&lt;/i&gt; algseadistada ning uuesti luua oma kliendi andmebaasi?&lt;/p&gt;&lt;p&gt;&lt;b&gt;See funktsioon on mõeldud peamiselt ainult hooldustöödeks. Märkus:&lt;/b&gt;Kuigi ühtegi faili ei eemaldata, siis see võib põhjustada märkimisväärset andmeliiklust ja võtta mitu minutit või tundi, sõltuvalt kataloogi suurusest. Kasuta seda võimalust ainult siis kui seda soovitab süsteemihaldur.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Sünkroniseerimine on käimas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Sünkroniseerimine on käimas.&lt;br/&gt;Kas sa soovid seda lõpetada?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 as &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Ühendatud %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 pole ajutiselt saadaval.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) %2-st serveri mahust on kasutuses.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Ühtegi %1 ühendust pole seadistatud.</translation>
</message>
@@ -750,8 +767,8 @@ Aega kokku jäänud %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Lisa kaust</translation>
</message>
@@ -817,22 +834,27 @@ Aega kokku jäänud %5</translation>
<translation>Kausta loomine ebaõnnestus - %1. Palun kontrolli käsitsi.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Vali see sünkroniseering tervele kontole</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Seda kataloogi juba sünkroniseeritakse.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Sa juba sünkroniseerid &lt;i&gt;%1&lt;/i&gt;, mis on &lt;i&gt;%2&lt;/i&gt; ülemkataloog.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Sa juba sünkroniseerid kõiki oma faile. Teise kataloogi sünkroniseering &lt;b&gt;ei ole&lt;/b&gt; toetatud. Kui soovid sünkroniseerida mitut kataloogi, palun eemalda hektel seadistatud sünkroniseeritav juurkataloog.</translation>
</message>
@@ -840,7 +862,7 @@ Aega kokku jäänud %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
@@ -1367,8 +1389,8 @@ for additional privileges during the process.</source>
<translation>Kohalik Sync Kataloog</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1977,22 +1999,22 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Märkimata kataloogid &lt;b&gt;eemaldatakse&lt;/b&gt; kohalikust failisüsteemist ning neid ei sünkroniseerita enam sellesse arvutisse</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Vali, mida sünkroniseerida</translation>
</message>
@@ -2015,13 +2037,13 @@ Selle kasutamine pole soovitatav.</translation>
<translation>Suurus</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Serveris pole praegu alamkaustasid.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index 2638a5b33..b9ea12386 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -89,22 +89,29 @@
<translation>Ezabatu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Aplikatu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Ezeztatu</translation>
</message>
@@ -114,127 +121,137 @@
<translation>&lt;user&gt; bezala &lt;server&gt;-n konektatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Ez da konturik konfiguratu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Baieztatu karpetaren ezabatzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Baieztatu Karpetaren Leheneratzea</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Benetan nahi duzu &lt;i&gt;%1&lt;/i&gt; karpeta leheneratu eta zure bezeroaren datu basea berreraiki?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Oharra:&lt;/p&gt; Funtzio hau mantenurako bakarrik diseinauta izan da. Ez da fitxategirik ezabatuko, baina honek datu trafiko handia sor dezake eta minutu edo ordu batzuk behar izango ditu burutzeko, karpetaren tamainaren arabera. Erabili aukera hau bakarrik zure kudeatzaileak esanez gero.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Sinkronizazioa martxan da</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Sinkronizazio martxan da.&lt;br/&gt;Bukatu nahi al duzu?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) tik %2 zerbitzariko lekua erabilia</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Ez dago %1 konexiorik konfiguratuta.</translation>
</message>
@@ -750,8 +767,8 @@ Geratzen den denbora %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Gehitu Karpeta</translation>
</message>
@@ -817,22 +834,27 @@ Geratzen den denbora %5</translation>
<translation>Huts egin du %1-(e)an karpeta sortzen. Egiaztatu eskuz.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Hautatu hau kontu osoa sinkronizatzeko</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Karpeta hau dagoeneko sinkronizatzen ari da.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Dagoeneko &lt;i&gt;%1&lt;/i&gt; sinkronizatzen ari zara, &lt;i&gt;%2&lt;/i&gt;-ren guraso karpeta dena.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Dagoeneko fitxategi guztiak sinkronizatzen ari zara. &lt;b&gt;Ezin&lt;b&gt; da sinkronizatu beste karpeta bat. Hainbat karpeta batera sinkronizatu nahi baduzu ezaba ezazu orain konfiguratuta duzun sinkronizazio karpeta nagusia.</translation>
</message>
@@ -840,7 +862,7 @@ Geratzen den denbora %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Hautatu zer nahi duzun sinkronizatzea: Sinkronizatu nahi ez dituzun urruneko azpikarpetak desmarkatu ditzazkezu.</translation>
</message>
@@ -1367,8 +1389,8 @@ for additional privileges during the process.</source>
<translation>Sinkronizazio karpeta lokala</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1977,22 +1999,22 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Hautatu zer sinkronizatu</translation>
</message>
@@ -2015,13 +2037,13 @@ Ez da gomendagarria erabltzea.</translation>
<translation>Tamaina</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 9f445cc54..4b3917c04 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -89,22 +89,29 @@
<translation>حذف</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>منصرف شدن</translation>
</message>
@@ -114,127 +121,137 @@
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>قبول کردن پاک شدن پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>قبول تنظیم مجدد پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>عملیات همگام سازی در حال اجراست.&lt;br/&gt;آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>رشته های ترجمه نشده</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>بدون %1 اتصال پیکربندی شده.</translation>
</message>
@@ -749,8 +766,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>ایجاد پوشه</translation>
</message>
@@ -816,22 +833,27 @@ Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation type="unfinished"/>
</message>
@@ -839,7 +861,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
@@ -1366,8 +1388,8 @@ for additional privileges during the process.</source>
<translation>پوشه همگام سازی محلی</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation type="unfinished"/>
</message>
@@ -1975,22 +1997,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation type="unfinished"/>
</message>
@@ -2013,13 +2035,13 @@ It is not advisable to use it.</source>
<translation>اندازه</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index 2a380a869..23324aeed 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -89,22 +89,29 @@
<translation>Poista</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Ilman valintaa olevat kansiot &lt;b&gt;poistetaan&lt;/b&gt; paikallisesta tiedostojärjestelmästä, eikä niitä synkronoida enää jatkossa tämän tietokoneen kanssa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Toteuta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Peruuta</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Yhdistetty palvelimeen &lt;server&gt; käyttäen &lt;user&gt; tunnusta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Tiliä ei ole määritelty.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Poista kansio</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Kansion luominen epäonnistui</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Paikallisen kansion &lt;i&gt;%1&lt;/i&gt; luominen epäonnistui.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Vahvista kansion poisto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Vahvista kansion alustus</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Synkronointi meneillään</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Synkronointioperaatio on meneillään.&lt;br/&gt;Haluatko keskeyttää sen?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Yhteys muodostettu kohteeseen %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<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="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Kirjauduttu ulos kohteesta %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<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="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Vahvista tilin poistaminen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) / %2 palvelimen tilasta käytössä.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Avaa kansio</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Palauta synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Keskeytä synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>%1-yhteyttä ei ole määritelty.</translation>
</message>
@@ -749,8 +766,8 @@ Aikaa jäljellä yhteensä %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Lisää kansio</translation>
</message>
@@ -816,22 +833,27 @@ Aikaa jäljellä yhteensä %5</translation>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Valitse tämä synkronoidaksesi koko tilin</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Tätä kansiota synkronoidaan jo.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Synkronoit jo kansiota &lt;i&gt;%1&lt;/i&gt;, ja se on kansion &lt;i&gt;%2&lt;/i&gt; yläkansio.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation type="unfinished"/>
</message>
@@ -839,7 +861,7 @@ Aikaa jäljellä yhteensä %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Päätä mitä synkronoidaan: voit valinnaisesti jättää valitsematta etäkansioita, joita et halua synkronoitavan.</translation>
</message>
@@ -1366,8 +1388,8 @@ for additional privileges during the process.</source>
<translation>Paikallinen synkronointikansio</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1976,22 +1998,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Ilman valintaa olevat kansiot &lt;b&gt;poistetaan&lt;/b&gt; paikallisesta tiedostojärjestelmästä, eikä niitä synkronoida enää jatkossa tämän tietokoneen kanssa</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Päätä mitä synkronoidaan: valitse etäkansiot, jotka haluat synkronoida.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Päätä mitä synkronoidaan: jätä valitsematta etäkansiot, joita et halua synkronoitavan.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Valitse synkronoitavat tiedot</translation>
</message>
@@ -2014,13 +2036,13 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<translation>Koko</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Palvelimella ei ole alihakemistoja juuri nyt.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Virhe alihakemistolistausta ladattaessa.</translation>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 7ab8935d7..67f23800a 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -89,22 +89,29 @@
<translation>Supprimer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>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.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Décochez les dossiers qui doivent être &lt;b&gt;supprimés&lt;/b&gt; 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="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Appliquer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Connecté à &lt;server&gt; en tant que &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Aucun compte configuré.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Retirer le dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Échec de création du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Impossible de créer le dossier local &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Confirmer le retrait du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Confirmez la réinitialisation du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Voulez-vous réellement réinitialiser le dossier &lt;i&gt;%1&lt;/i&gt; et reconstruire votre base de données cliente ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; Cette fonctionnalité existe pour des besoins de maintenance uniquement. Aucun fichier ne sera supprimé, mais cela peut causer un trafic de données conséquent et peut durer de plusieurs minutes à plusieurs heures, en fonction de la taille du dossier. Utilisez cette option uniquement sur avis de votre administrateur.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Synchronisation en cours</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La synchronisation est en cours.&lt;br/&gt;Voulez-vous l&apos;arrêter ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 en tant que &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Connecté à %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Le serveur %1 est temporairement indisponible.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Session sur %1 fermée.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<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="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Certains nouveaux dossiers n&apos;ont pas été synchronisés en raison de leur taille trop importante : %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Confirmation de suppression de compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Êtes-vous sûr de vouloir supprimer le compte &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; Aucun fichiers ne seront supprimés&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>L&apos;espace disque sur le serveur est utilisé à %3% (%1 sur %2)</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Ouvrir le dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Reprendre</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Mettre en pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Voulez-vous vraiment arrêter de synchroniser le dossier &lt;i&gt;%1&lt;/i&gt; ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt;Aucun fichiers ne seront supprimés.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d&apos;utilisation de stockage n&apos;est disponible.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
@@ -751,8 +768,8 @@ Temps restant total %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Ajouter un dossier</translation>
</message>
@@ -818,22 +835,27 @@ Temps restant total %5</translation>
<translation>Échec à la création du dossier sur %1. Veuillez vérifier manuellement.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Sélectionnez ceci pour synchroniser l&apos;ensemble du compte</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Ce dossier est déjà en cours de synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Vous synchronisez déja &lt;i&gt;%1&lt;/i&gt;, qui est un dossier parent de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Vous sychronisez déjà tous vos fichiers. Synchroniser un autre dossier n&apos;est &lt;b&gt;pas&lt;/b&gt; pris en charge. Si vous voulez synchroniser plusieurs dossiers, veuillez supprimer la synchronisation du dossier racine qui est configurée actuellement.</translation>
</message>
@@ -841,7 +863,7 @@ Temps restant total %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Choisissez le contenu à synchroniser : vous pouvez éventuellement désélectionner les sous-dossiers distants que vous ne désirez pas synchroniser.</translation>
</message>
@@ -1375,8 +1397,8 @@ L&apos;assistant peut demander des privilèges additionnels durant le processus.
<translation>Dossier de synchronisation local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1991,22 +2013,22 @@ Il est déconseillé de l&apos;utiliser.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Décochez les dossiers qui doivent être &lt;b&gt;supprimés&lt;/b&gt; de votre disque local et qui ne doivent pas être synchronisés avec cet ordinateur.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Choisir le contenu à synchroniser : Sélectionnez les sous-dossiers distants que vous voulez synchroniser.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Choisir le contenu à synchroniser : Désélectionnez les sous-dossiers distants que vous ne voulez pas synchroniser.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Choisir le contenu à synchroniser</translation>
</message>
@@ -2029,13 +2051,13 @@ Il est déconseillé de l&apos;utiliser.</translation>
<translation>Taille</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Aucun sous-dossier sur le serveur.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Une erreur est survenue lors du chargement de la liste des sous-dossiers.</translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 0143f557d..50a1dec57 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -89,22 +89,29 @@
<translation>Eliminar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Algúns cartafoles, como os cartafoles de rede montados ou os compartidos, poden ten diferentes límites.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Os cartafoles non seleccionados van seren &lt;b&gt;eliminados&lt;/b&gt; do seu sistema de ficheiros local e non volverán sincronizarse con esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Non hai contas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Retirar o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Non foi posíbel crear o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Non foi posíbel crear o cartafol local &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar a retirada do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Confirmar o restabelecemento do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Confirma que quere restabelecer o cartafol &lt;i&gt;%1&lt;/i&gt; e reconstruír as súa base datos no cliente?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esta función está deseñada só para fins de mantemento. Non se retirará ningún ficheiro, porén, isto pode xerar un tráfico de datos significativo e levarlle varios minutos ou horas en completarse, dependendo do tamaño do cartafol. Utilice esta opción só se o aconsella o administrador.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Sincronización en proceso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Estase a realizar a sincronización.&lt;br/&gt;Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<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="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Desconectado de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<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="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Hai cartafoles novos que non foron sincronizados, por seren grandes de máis: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Confirmar a eliminación da conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation> Espazo usado do servidor %1 (%3%) de %2.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Abrir o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Continuar coa sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Por en pausa a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
@@ -751,8 +768,8 @@ Tempo total restante %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Engadir un cartafol</translation>
</message>
@@ -818,22 +835,27 @@ Tempo total restante %5</translation>
<translation>Non foi posíbel crear o cartafol en %1. Compróbeo manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Escolla isto para sincronizar toda a conta</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Este cartafol xa está sincronizado.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Xa está a sincronizar &lt;i&gt;%1&lt;/i&gt;, é o cartafol pai de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Xa se están a sincronizar todos os ficheiros. Isto &lt;b&gt;non&lt;/b&gt; é compatíbel co sincronización doutro cartafol. Se quere sincronizar varios cartafoles, retire a sincronización do cartafol raíz configurado actualmente.</translation>
</message>
@@ -841,7 +863,7 @@ Tempo total restante %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Escolla que sincronizar: Opcionalmente pode deselecionar subcartafoles remotos que non queira sincronizar.</translation>
</message>
@@ -1375,8 +1397,8 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl
<translation>Sincronización do cartafol local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1988,22 +2010,22 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Os cartafoles non seleccionados van seren &lt;b&gt;eliminados&lt;/b&gt; do seu sistema de ficheiros local e non volverán sincronizarse con esta computadora</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Escolla que sincronizar: Seleccione os subcartafoles remotos que quere sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Escolla que sincronizar: Desmarque os subcartafoles remotos que non queira sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Escolla que sincronizar</translation>
</message>
@@ -2026,13 +2048,13 @@ Recomendámoslle que non o use.</translation>
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Actualmente non hai subcartafoles no servidor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Produciuse un erro mentres se cargaba a lista de subcartafoles.</translation>
</message>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index 368850031..7d36e98a5 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -89,22 +89,29 @@
<translation>Törlés</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Alkalmaz</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Mégsem</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Csatlakoztatva &lt;user&gt; felhasználóval ehhez: &lt;server&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Nincs beállított kapcsolat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Mappa törlése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Könyvtár törlésének megerősítése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Mappa visszaállítás megerősítése</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Szinkronizálás fut</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>A szinkronizálás folyamatban van. &lt;br/&gt;Szakítsuk meg?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Csatlakoztatva ehhez: %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Nincs beállított kapcsolat: %1.</translation>
</message>
@@ -747,8 +764,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Mappa hozzáadása</translation>
</message>
@@ -814,22 +831,27 @@ Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Ez a mappa már szinkronizálva van.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation type="unfinished"/>
</message>
@@ -837,7 +859,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
@@ -1364,8 +1386,8 @@ for additional privileges during the process.</source>
<translation>Helyi Sync mappa</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1973,22 +1995,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Szinkronizálandó elemek kiválasztása</translation>
</message>
@@ -2011,13 +2033,13 @@ It is not advisable to use it.</source>
<translation>Méret</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index a1aee3622..7bd449f16 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -89,22 +89,29 @@
<translation>Elimina</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Alcune cartelle, incluse le cartelle montate o condivise in rete, potrebbero avere limiti diversi.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Le cartelle non marcate saranno &lt;b&gt;rimosse&lt;/b&gt; dal file system locale e non saranno sincronizzate più con questo computer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Applica</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Connesso a &lt;server&gt; come &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Nessun account configurato.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Rimuovi cartella</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Creazione della cartella non riuscita</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Impossibile creare la cartella locale &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Conferma la rimozione della cartella</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Conferma il ripristino della cartella</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vuoi davvero ripristinare la cartella &lt;i&gt;%1&lt;/i&gt; e ricostruire il database del client?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; questa funzione è destinata solo a scopi di manutenzione. Nessun file sarà rimosso, ma può causare un significativo traffico di dati e richiedere diversi minuti oppure ore, in base alla dimensione della cartella. Utilizza questa funzione solo se consigliata dal tuo amministratore.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>La sincronizzazione è in corso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>L&apos;operazione di sincronizzazione è in corso.&lt;br/&gt;Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 come &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Connesso a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Il server %1 è temporaneamente non disponibile.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Disconnesso da %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<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="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Ci sono nuove cartelle condivise che non sono state sincronizzate poiché sono troppo grandi: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Conferma eliminazione account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vuoi davvero eliminare la connessione all&apos;account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; ciò &lt;b&gt;non&lt;/b&gt; eliminerà alcun file.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) di %2 spazio in uso sul server.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Apri cartella</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Riprendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Sospendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vuoi davvero fermare la sincronizzazione della cartella &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; ciò &lt;b&gt;non&lt;/b&gt; eliminerà alcun file.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull&apos;utilizzo dello spazio di archiviazione.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
@@ -751,8 +768,8 @@ Totale tempo rimanente %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Aggiungi cartella</translation>
</message>
@@ -818,22 +835,27 @@ Totale tempo rimanente %5</translation>
<translation>Non è stato possibile creare la cartella su %1. Controlla manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Selezionala per sincronizzare l&apos;intero account</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Questa cartella è già sincronizzata.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Stai già sincronizzando &lt;i&gt;%1&lt;/i&gt;, che è la cartella superiore di &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Stai già sincronizzando tutti i tuoi file. La sincronizzazione di un&apos;altra cartella &lt;b&gt;non&lt;/b&gt; è supportata. Se vuoi sincronizzare più cartelle, rimuovi la configurazione della cartella principale di sincronizzazione.</translation>
</message>
@@ -841,7 +863,7 @@ Totale tempo rimanente %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Scegli cosa sincronizzare: puoi deselezionare opzionalmente le sottocartelle remote che non desideri sincronizzare.</translation>
</message>
@@ -1374,8 +1396,8 @@ for additional privileges during the process.</source>
<translation>Cartella locale di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1988,22 +2010,22 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Le cartelle non marcate saranno &lt;b&gt;rimosse&lt;/b&gt; dal file system locale e non saranno sincronizzate più con questo computer</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Scegli cosa sincronizzare: seleziona le sottocartelle remote che desideri sincronizzare.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Scegli cosa sincronizzare: deseleziona le sottocartelle remote che non desideri sincronizzare.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Scegli cosa sincronizzare</translation>
</message>
@@ -2026,13 +2048,13 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Dimensione</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Attualmente non ci sono sottocartelle sul server.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Si è verificato un errore durante il caricamento dell&apos;elenco delle sottocartelle.</translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index 778c0b0aa..136604e9d 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -89,22 +89,29 @@
<translation>削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>チェックしていないフォルダーはローカルファイルシステムから &lt;b&gt;削除&lt;/b&gt;され、このコンピューターと同期されなくなります。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>適用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
@@ -114,127 +121,137 @@
<translation>&lt;server&gt; に &lt;user&gt; で接続中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>フォルダーを削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>フォルダーの作成に失敗しました</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;ローカルフォルダー &lt;i&gt;%1&lt;/i&gt; を作成できません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>フォルダーの削除を確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>フォルダーのリセットを確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;本当にフォルダー &lt;i&gt;%1&lt;/i&gt; をリセットしてクライアントのデータベースを再構築しますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt;この機能は保守目的のためだけにデザインされています。ファイルは削除されませんが、完了するまでにデータ通信が明らかに増大し、数分、あるいはフォルダーのサイズによっては数時間かかります。このオプションは管理者に指示された場合にのみ使用してください。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>同期作業を実行中です。&lt;br/&gt;終了しますか?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>&lt;i&gt;%2&lt;/i&gt; の %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>%1 に接続</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>サーバー %1 は一時的に利用できません</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>%1 からサインアウトしました。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation>%2 の %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>転送容量が大きいため、同期されていない新しいフォルダーがあります: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>アカウント削除を確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt; アカウント &lt;i&gt;%1&lt;/i&gt; を本当に削除しますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>使用中のサーバー領域: %1 (%3%) / %2</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>フォルダーを開く</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>再開</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>一時停止</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;フォルダー&lt;i&gt;%1&lt;/i&gt;の同期を本当に止めますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
@@ -751,8 +768,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>フォルダーを追加</translation>
</message>
@@ -818,22 +835,27 @@ Total time left %5</source>
<translation>%1 にフォルダーを作成できませんでした。手作業で確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>アカウント全体を同期する場合はこちらを選択</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>このフォルダーはすでに同期されています。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>&lt;i&gt;%1&lt;/i&gt;は、&lt;i&gt;%2&lt;/i&gt;の親フォルダーですでに同期しています。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>すべてのファイルはすでに同期されています。他のフォルダーの同期は&lt;b&gt;サポートしていません&lt;/&gt;。複数のフォルダーを同期したい場合は、現在設定されているルートフォルダー同期設定を削除してください。</translation>
</message>
@@ -841,7 +863,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>何を同期するか選択: 同期したくないリモートのサブフォルダーは、同期対象から外せます。</translation>
</message>
@@ -1374,8 +1396,8 @@ for additional privileges during the process.</source>
<translation>ローカル同期フォルダー</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1985,22 +2007,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>チェックしていないフォルダーはローカルファイルシステムから &lt;b&gt;削除&lt;/b&gt;され、このコンピューターと同期されなくなります。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>同期対象の選択: 同期したいリモートのサブフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>同期対象の選択: 同期したくないリモートのサブフォルダーは、同期対象から外せます。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>同期フォルダーを選択</translation>
</message>
@@ -2023,13 +2045,13 @@ It is not advisable to use it.</source>
<translation>サイズ</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>現在サーバーにサブフォルダーはありません。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>サーバーからフォルダーのリスト取得時にエラーが発生しました。</translation>
</message>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index bf547ead4..93bd0a9dc 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -89,22 +89,29 @@
<translation>Slett</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Umarkerte mapper vil bli &lt;b&gt;fjernet&lt;/b&gt; fra ditt lokale filsystem og vil ikke bli synkronisert med denne maskinen lenger</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Tilkoblet &lt;server&gt; som &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Ingen konto konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Bekreft sletting av mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Bekreft tilbakestilling av mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vil du virkelig tilbakestille mappe &lt;i&gt;%1&lt;/i&gt; og bygge klientdatabaesn på nytt?&lt;/p&gt;&lt;p&gt;&lt;b&gt;NB:&lt;/b&gt; Denne funksjonen er bare til bruk for vedlikehold. Ingen filer vil bli fjernet, men dette kan forårsake betydelig nettverkstrafikk og ta flere minutter eller timer å utføre, avhengig av størrelsen på mappen. Bruk denne muligheten bare hvis en administrator har rådet deg til det.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Synkroniserer...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Synkronisering kjører.&lt;br/&gt;Vil du avbryte den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) av %2 serverplass i bruk.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1-forbindelse konfigurert.</translation>
</message>
@@ -750,8 +767,8 @@ Tid som gjenstår %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Legg til mappe</translation>
</message>
@@ -817,22 +834,27 @@ Tid som gjenstår %5</translation>
<translation>Klarte ikke å opprette mappen på %1. Sjekk manuelt.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Velg dette for å synkronisere en hel konto</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Denne mappen synkroniseres allerede.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Du synkroniserer allerede &lt;i&gt;%1&lt;/i&gt;, som er foreldremappe for &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Du synkroniserer allerede alle filene dine. Synkronisering av enda en mappe støttes &lt;b&gt;ikke&lt;/b&gt;. Hvis du vil synkronisere flere mapper må du fjerne den konfigurerte synkroniseringen av rotmappe.</translation>
</message>
@@ -840,7 +862,7 @@ Tid som gjenstår %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Velg hva som skal synkroniseres: Du kan velge bort mapper som du ikke vil synkronisere.</translation>
</message>
@@ -1368,8 +1390,8 @@ kan be om ytterligere rettigheter under behandlingen.</translation>
<translation>Lokal synkroniseringsmappe</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1982,22 +2004,22 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Umarkerte mapper vil bli &lt;b&gt;fjernet&lt;/b&gt; fra ditt lokale filsystem og vil ikke bli synkronisert med denne maskinen lenger</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Velg hva som skal synkroniseres: Velg eksterne undermapper som du vil synkronisere.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Velg hva som skal synkroniseres: Velg bort eksterne undermapper som du ikke vil synkronisere.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Velg hva som synkroniseres</translation>
</message>
@@ -2020,13 +2042,13 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>Størrelse</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Ingen undermapper på serveren nå</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Det oppstod en feil ved lasting av liste av undermapper.</translation>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index 228ae8310..b353bd226 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -89,22 +89,29 @@
<translation>Verwijderen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Sommige mappen, waaronder netwerkmappen en gedeelde mappen, zouden verschillende limieten kunnen hebben.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Niet geselecteerde mappen worden &lt;b&gt;verwijderd&lt;/b&gt; van uw lokale bestandssysteem en worden niet meer gesynchroniseerd met deze computer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Toepassen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
@@ -114,128 +121,138 @@
<translation>Verbonden met &lt;server&gt; als &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Geen account ingesteld.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Verwijder map</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Maken map mislukt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Kon lokale map &lt;i&gt;%1&lt;/i&gt; niet maken.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Bevestig het verwijderen van de map</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Bevestig map reset</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Wilt u map &lt;i&gt;%1&lt;/i&gt; echt resetten en de database opnieuw opbouwen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Let op:&lt;/b&gt; Deze functie is alleen ontworpen voor onderhoudsdoeleinden. Hoewel er geen bestanden worden verwijderd, kan dit een aanzienlijke hoeveelheid dataverkeer tot gevolg hebben en minuten tot zelfs uren duren, afhankelijk van de omvang van de map. Gebruik deze functie alleen als dit wordt geadviseerd door uw applicatiebeheerder.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Bezig met synchroniseren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Bezig met synchroniseren.&lt;br/&gt;Wilt u stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>
%1 als &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Verbonden met %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 is tijdelijk niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Uitgelogd van %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<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="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Er zijn nieuwe mappen die niet gesynchroniseerd werden omdat ze te groot zijn: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Bevestig verwijderen account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Wilt u echt de verbinding met het account &lt;i&gt;%1&lt;/i&gt; verbreken?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Let op:&lt;/b&gt; Hierdoor verwijdert u &lt;b&gt;geen&lt;/b&gt; bestanden.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) van %2 serverruimte in gebruik.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Openen map</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Hervatten sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Pauzeren sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Weet u zeker dat u de synchronisatie van map &lt;i&gt;%1&lt;/i&gt; wilt stoppen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opmerking:&lt;/b&gt; Dit zal &lt;b&gt;geen&lt;/b&gt; bestanden verwijderen.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
@@ -753,8 +770,8 @@ Totaal resterende tijd %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Voeg map toe</translation>
</message>
@@ -820,22 +837,27 @@ Totaal resterende tijd %5</translation>
<translation>Aanmaken van de map op %1 mislukt. Controleer handmatig.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Kies dit om uw volledige account te synchroniseren</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Deze map is al gesynchroniseerd.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>U synchroniseert &lt;i&gt;%1&lt;/i&gt; al, dat is de bovenliggende map van &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>U bent al uw bestanden al aan het synchroniseren.Het synchroniseren van een andere map wordt &lt;b&gt;niet&lt;/b&gt; ondersteund. Als u meerdere mappen wilt synchroniseren moet u de nu geconfigureerde synchronisatie hoofdmap verwijderen.</translation>
</message>
@@ -843,7 +865,7 @@ Totaal resterende tijd %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Kies wat u wilt synchroniseren: u kunt optioneel submappen die u niet wilt synchroniseren deselecteren.</translation>
</message>
@@ -1377,8 +1399,8 @@ vragen om extra autorisaties tijdens installatie.</translation>
<translation>Lokale synchronisatiemap</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1991,22 +2013,22 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Niet geselecteerde mappen worden &lt;b&gt;verwijderd&lt;/b&gt; van uw lokale bestandssysteem en worden niet meer gesynchroniseerd met deze computer</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Kies wat u wilt synchroniseren: Selecteer externe submappen die u wilt synchroniseren.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Kies wat u wilt synchroniseren: u kunt submappen die u niet wilt synchroniseren deselecteren.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Wat synchroniseren</translation>
</message>
@@ -2029,13 +2051,13 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>Grootte</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Momenteel geen submappen op de server.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Er trad een fout op bij het laden van de lijst met submappen.</translation>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index 75dab586c..1383db9fa 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -89,22 +89,29 @@
<translation>Usuń</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Zastosuj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Połączony z &lt;server&gt; jako &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Brak skonfigurowanych kont.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Potwierdź usunięcie katalogu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Potwierdź reset folderu </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Czy rzeczywiście chcesz zresetować folder &lt;i&gt;%1&lt;/i&gt; i przebudować bazę klientów?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; Ta funkcja została przewidziana wyłącznie do czynności technicznych. Nie zostaną usunięte żadne pliki, ale może to spowodować znaczący wzrost ruchu sieciowego i potrwać kilka minut lub godzin, w zależności od rozmiaru folderu. Używaj tej opcji wyłącznie, jeśli Twój administrator doradził Ci takie działanie.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Synchronizacja uruchomiona</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Operacja synchronizacji jest uruchomiona.&lt;br&gt;Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) z %2 przestrzeni na serwerze w użyciu.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
@@ -750,8 +767,8 @@ Pozostało czasu %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Dodaj folder</translation>
</message>
@@ -817,22 +834,27 @@ Pozostało czasu %5</translation>
<translation>Nie udało się utworzyć folderu na %1. Proszę sprawdzić ręcznie.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Wybierz to, aby zsynchronizować całe konto</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Ten katalog jest już synchronizowany.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Synchronizujesz już &lt;i&gt;%1&lt;/i&gt;, który jest folderem nadrzędnym &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Już aktualizujesz wszystkie pliku. Synchronizacja innego folderu &lt;b&gt;nie&lt;/b&gt; jest wspierana. Jeśli chcesz synchronizować wiele folderów, proszę usuń aktualnie skonfigurowaną synchronizację folderu głównego.</translation>
</message>
@@ -840,7 +862,7 @@ Pozostało czasu %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Wybierz co synchronizować: Możesz opcjonalnie odznaczyć podkatalogi, których nie chcesz synchronizować.</translation>
</message>
@@ -1368,8 +1390,8 @@ o dodatkowe uprawnienia podczas procesu aktualizacji.</translation>
<translation>Folder lokalnej synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1978,22 +2000,22 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Wybierz co synchronizować</translation>
</message>
@@ -2016,13 +2038,13 @@ Niezalecane jest jego użycie.</translation>
<translation>Rozmiar</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index eb80a91a9..ac31787d2 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -89,22 +89,29 @@
<translation>Apagar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Algumas pastas, incluindo a rede montada ou pastas compartilhadas, porderão ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Pastas não selecionadas serão &lt;b&gt;removidas&lt;/b&gt; do seu sistema local de ficheiros e não serão sincronizadas neste computador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Conetado com &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Remover pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Falhou a criação da pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Não foi posssível criar a pasta local&lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar Remover Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Confirmar Repor Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Deseja mesmo repor a pasta &lt;i&gt;%1&lt;/i&gt; e reconstruir a base de dados do seu cliente?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esta função é desenhada apenas para efeitos de manutenção. Os ficheiros não irão ser removidos, mas este processo pode aumentar o tráfego de dados e demorar alguns minutos ou horas a completar, dependendo do tamanho da pasta. Utilize esta funcionalidade apenas se aconselhado pelo seu administrador.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Sincronização em Execução</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>A operação de sincronização está a ser executada.&lt;br/&gt;Deseja terminar?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Conetado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<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="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Terminou a sesão de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<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="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Existem pastas novas que não foram sincronizadas porque estas eram muito grandes: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Confirmar Eliminação de Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) de %2 de espaço do servidor em uso.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Abrir a pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Retomar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
@@ -749,8 +766,8 @@ Tempo total restante %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Adicionar Pasta</translation>
</message>
@@ -816,22 +833,27 @@ Tempo total restante %5</translation>
<translation>Impossível criar a pasta em %1. Por favor valide manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Escolha para sincronizar a sua conta</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Esta pasta já está a ser sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Já está a sincronizar &lt;i&gt;%1&lt;/i&gt;, que é uma pasta &apos;parente&apos; de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Já está a sincronizar todos os seus ficheiros. Sincronizar outra pasta&lt;b&gt;não&lt;/b&gt; é suportado. Se deseja sincronizar múltiplas pastas, por favor altere a configuração da pasta raiz de sincronização.</translation>
</message>
@@ -839,7 +861,7 @@ Tempo total restante %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Escolher o que Sincronizar. Opcionalmente, é possível desmarcar sub pastas remotas que você não deseja sincronizar.</translation>
</message>
@@ -1371,8 +1393,8 @@ privilégios adicionais durante o processo.</translation>
<translation>Pasta local de sincronização</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1984,22 +2006,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Pastas não selecionadas serão &lt;b&gt;removidas&lt;/b&gt; do seu sistema local de ficheiros e não serão sincronizadas neste computador</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Escolher o que Sincronizar: Marque as sub pastas remotas que deseja sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Escolher o que Sincronizar: Desmarque as sub pastas remotas que não deseja sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Escolher o Que Sincronizar</translation>
</message>
@@ -2022,13 +2044,13 @@ It is not advisable to use it.</source>
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Atualmente não há sub-pastas no servidor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Ocorreu um erro ao carregar a lista de sub-pastas.</translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index 55d16f73c..53b6ac21b 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -89,22 +89,29 @@
<translation>Excluir</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Algumas pastas, incluindo as montada em rede ou pastas compartilhadas, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Pastas não marcadas serão &lt;b&gt;removidos&lt;/b&gt; 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="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Aplicar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Conectado com &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Remover pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Falha na criação de pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Não foi possível criar pasta local &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Confirmar Remoção da Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Confirme Reiniciar Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Você realmente deseja redefinir a pasta &lt;i&gt;%1&lt;/i&gt; e reconstruir seu banco de dados de clientes?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esta função é usada somente para manutenção. Nenhum arquivo será removido, mas isso pode causar significativo tráfego de dados e levar vários minutos ou horas, dependendo do tamanho da pasta. Somente use esta opção se adivertido por seu administrador.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Sincronização Acontecendo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>A operação de sincronização está acontecendo.&lt;br/&gt;Você deseja finaliza-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Conectado a %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<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="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Assibndado por %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<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="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Há novas pastas que não foram sincronizados, porque elas são muito grandes: 1%</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Confirmar a Eliminação da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Você realmente deseja remover a conexão desta conta&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Isto &lt;b&gt;não&lt;/b&gt; irá deletar nenhum arquivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) de %2 do espaço em uso no servidor.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Abrir pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Resumir sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Você realmente deseja para a sincronização desta pasta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Isto &lt;b&gt;não&lt;/b&gt; vai deletar qualquer arquivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Nenhuma %1 conexão configurada.</translation>
</message>
@@ -751,8 +768,8 @@ Total de tempo que falta 5%</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Adicionar Pasta</translation>
</message>
@@ -818,22 +835,27 @@ Total de tempo que falta 5%</translation>
<translation>Falha ao criar a pasta em %1. Por favor, verifique manualmente.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Escolha esta opção para sincronizar a conta inteira</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Esta pasta já está sendo sincronizada.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Você já está sincronizando &lt;i&gt;%1&lt;/i&gt;, que é uma pasta mãe de &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Você já está sincronizando todos os seus arquivos. Sincronizar outra pasta &lt;b&gt;não&lt;/ b&gt; é possível. Se você deseja sincronizar várias pastas, por favor, remova a sincronização configurada atualmente para a pasta raiz.</translation>
</message>
@@ -841,7 +863,7 @@ Total de tempo que falta 5%</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Escolha o que Sincronizar: Você pode, opcionalmente, desmarcar subpastas remotas que você não deseja sincronizar.</translation>
</message>
@@ -1376,8 +1398,8 @@ por privilégios adicionais durante o processo.</translation>
<translation>Sincronizar Pasta Local</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1988,22 +2010,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Pastas não marcadas serão &lt;b&gt;removidos&lt;/b&gt; de seu sistema de arquivos local e não serão mais sincronizadas com este computador</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Escolha o que Sincronizar: Selecione subpastas remotas que você deseja sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Escolha o que Sincronizar: Desmarque subpastas remotas que você não deseja sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Escolher o que Sincronizar</translation>
</message>
@@ -2026,13 +2048,13 @@ It is not advisable to use it.</source>
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Nenhuma sub-pasta atualmente no servidor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Ocorreu um erro ao carregar a lista de sub-pastas.</translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index c9538ca1f..e5af0e979 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -89,22 +89,29 @@
<translation>Удалить</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Некоторые каталоги, включая сетевые или общие, могут иметь разные ограничения.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Не отмеченные каталоги будут &lt;b&gt;удалены&lt;/b&gt; из вашей локальной файловой системы и больше не будут синхронизироваться на этом компьютере</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Применить</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Подключен к &lt;server&gt; как &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Учётная запись не настроена.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>Удалить каталог</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>Ошибка создания каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Не удалось создать локальный каталог &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Подтвердите удаление каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Подтвердить сброс каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Вы действительно хотите сбросить каталог &lt;i&gt;%1&lt;/i&gt; и перестроить клиентскую базу данных?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Заметка:&lt;/b&gt; Данный функционал предназначен только для технического обслуживания. Файлы не будут удалены, но, в зависимости от размера каталога, операция может занять от нескольких минут до нескольких часов и может вызвать передачу большого объема данных. Используйте данную операцию только по рекомендации администратора.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Синхронизация запущена</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Синхронизация запущена.&lt;br/&gt;Вы хотите её остановить?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 как &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>Соединен с %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сервер %1 временно недоступен.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>Успешно вышли из %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation>Нет соединения с %1 в %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>Есть новые каталоги, которые не были синхронизированы, так как они слишком большие: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>Подтвердите удаление учетной записи</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>Используется %1 (%3%) из %2 места на сервере.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>Открыть папку</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>Продолжить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>Приостановить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
@@ -751,8 +768,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Добавить каталог</translation>
</message>
@@ -818,22 +835,27 @@ Total time left %5</source>
<translation>Невозможно создать каталог по пути %1. Попробуйте создать его вручную.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Нажмите здесь для синхронизации всей учётной записи</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Этот каталог уже выбран для синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Каталог &lt;i&gt;%1&lt;/i&gt; уже настроен для синхронизации, и он является родительским для каталога &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>В данный момент включена синхронизация всех файлов. Синхронизация другого каталога в этом режиме &lt;b&gt;не&lt;/b&gt; поддерживается. Удалите синхронизацию корневого каталога сервера для синхронизации нескольких локальных каталогов.</translation>
</message>
@@ -841,7 +863,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Выберите Что Синхронизировать: Вы можете отменить выбор папок, которые Вы не хотите синхронизировать.</translation>
</message>
@@ -1375,8 +1397,8 @@ for additional privileges during the process.</source>
<translation>Локальный каталог синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1993,22 +2015,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Не отмеченные каталоги будут &lt;b&gt;удалены&lt;/b&gt; из вашей локальной файловой системы и больше не будут синхронизироваться на этом компьютере</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Выберите Что Синхронизировать: Выберите папки на удалённом сервер, которые Вы хотели бы синхронизировать.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Выберите Что Синхронизировать: Снимите выбор папок на удалённом сервере, которые Вы не хотите синхронизировать.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Уточнить объекты</translation>
</message>
@@ -2031,13 +2053,13 @@ It is not advisable to use it.</source>
<translation>Размер</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Нет подкаталогов на сервере на данный момент.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Возникла ошибка при загрузке списка подкаталогов.</translation>
</message>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index 543d79a61..08c49e42e 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -89,22 +89,29 @@
<translation>Zmazať</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neoznačené priečinky budú &lt;b&gt;odstránené&lt;/b&gt; z lokálneho systému a nebudú už synchronizované na tento počítač</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Aplikovať</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Zrušiť</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Spojené z &lt;server&gt; ako &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Žiadny účet nie je nastavený.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Potvrdiť odstránenie priečinka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Potvrdiť zresetovanie priečinka</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Skutočne chcete zresetovať priečinok &lt;i&gt;%1&lt;/i&gt; a opätovne zostaviť klientskú databázu?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Táto funkcia je navrhnutá len pre účely údržby. Žiadne súbory nebudú odstránené, ale môže to spôsobiť značnú dátovú prevádzku a vyžiadať si niekoľko minút alebo hodín pre dokončenie, v závislosti od veľkosti priečinka. Použite túto možnosť pokiaľ máte doporučenie od správcu.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Prebiehajúca synchronizácia</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Proces synchronizácie práve prebieha.&lt;br/&gt;Chcete ho ukončiť?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) z %2 miesta na disku je použité. </translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Žiadne nakonfigurované %1 spojenie</translation>
</message>
@@ -750,8 +767,8 @@ Celkom zostáva %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Pridať priečinok</translation>
</message>
@@ -817,22 +834,27 @@ Celkom zostáva %5</translation>
<translation>Na %1 zlyhalo vytvorenie priečinka. Skontrolujte to, prosím, ručne.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Zvoľte pre synchronizáciu celého účtu</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Tento priečinok sa už synchronizuje.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Priečinok &lt;i&gt;%1&lt;/i&gt; už synchronizujete a je nadradený priečinku &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Už synchronizujete všetky vaše súbory. Synchronizácia dalšieho priečinka &lt;b&gt;nie je&lt;/b&gt; podporovaná. Ak chcete synchronizovať viac priečinkov, odstránte, prosím, synchronizáciu aktuálneho kořenového priečinka.</translation>
</message>
@@ -840,7 +862,7 @@ Celkom zostáva %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Výber synchronizácie: Môžete dodatočne odobrať vzdialené podpriečinky, ktoré si neželáte synchronizovať.</translation>
</message>
@@ -1368,8 +1390,8 @@ môžu byť vyžadované dodatočné oprávnenia.</translation>
<translation>Lokálny synchronizačný priečinok</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1984,22 +2006,22 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neoznačené priečinky budú &lt;b&gt;odstránené&lt;/b&gt; z lokálneho systému a nebudú už synchronizované na tento počítač</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Výber synchronizácie: Označte vzdialené podpriečinky, ktoré si želáte synchronizovať.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Výber synchronizácie: Odoberte vzdialené podpriečinky, ktoré si neželáte synchronizovať.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Vybrať čo synchronizovať</translation>
</message>
@@ -2022,13 +2044,13 @@ Nie je vhodné ju používať.</translation>
<translation>Veľkosť</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Na serveri teraz nie sú žiadne podpriečinky.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Nastala chyba počas načítavania zoznamu podpriečinkov.</translation>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index cad10f6c4..a8037c103 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -89,22 +89,29 @@
<translation>Izbriši</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neizbrane mape bodo &lt;b&gt;odstranjene&lt;/b&gt; iz krajevnega datotečnega sistema in s tem računalnikom ne bodo več usklajevane!</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Uveljavi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Vzpostavljena je povezava s strežnikom &lt;server&gt; kot &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Ni nastavljenega računa.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Potrdi odstranitev mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Potrdi ponastavitev mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ali ste prepričani, da želite mapo &lt;i&gt;%1&lt;/i&gt; ponastaviti in ponovno izgraditi podatkovno zbirko?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opozorilo:&lt;/b&gt; Možnost je zasnovana za vzdrževanje. Datoteke sicer ne bodo spremenjene, vendar pa je opravilo lahko zelo dolgotrajno in lahko traja tudi več ur. Trajanje je odvisno od velikosti mape. Možnost uporabite le, če vam to svetuje skrbnik sistema.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Usklajevanje je v teku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Izvaja se usklajevanje.&lt;br/&gt;Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) od %2 prostora strežnika je v uporabi.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljene povezave %1.</translation>
</message>
@@ -750,8 +767,8 @@ Skupaj še %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Dodaj mapo</translation>
</message>
@@ -817,22 +834,27 @@ Skupaj še %5</translation>
<translation>Ustvarjanje mape na %1 je spodletelo. Morda jo je mogoče ustvariti ročno.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Izberite možnost za usklajevanje celotnega računa.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Ta mapa je že določena za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Datoteke se že usklajujejo na ravni mape &lt;i&gt;%1&lt;/i&gt;, ki je nadrejena mapi &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Trenutno so v usklajevanju vse datoteke korenske mape. Usklajevanje še ene mape &lt;b&gt;ni&lt;/b&gt; podprto. Če želite uskladiti več map, je treba odstraniti trenutno nastavljeno korensko mapo in spremeniti nastavitve.</translation>
</message>
@@ -840,7 +862,7 @@ Skupaj še %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Izbira usklajevanja: izbirno je mogoče določiti oddaljene podrejene mape, ki naj se ne usklajujejo.</translation>
</message>
@@ -1368,8 +1390,8 @@ zahteva skrbniška dovoljenja za dokončanje opravila.</translation>
<translation>Krajevna mapa usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1978,22 +2000,22 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Neizbrane mape bodo &lt;b&gt;odstranjene&lt;/b&gt; iz krajevnega datotečnega sistema in s tem računalnikom ne bodo več usklajevane!</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Izbor map za usklajevanje</translation>
</message>
@@ -2016,13 +2038,13 @@ Uporaba ni priporočljiva.</translation>
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Na strežniku trenutno ni podrejenih map.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Prišlo je do napake med nalaganjem seznama podrejenih map.</translation>
</message>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index aa48aa250..89f5234a6 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -89,22 +89,29 @@
<translation>Обриши</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Неозначене фасцикле биће &lt;b&gt;уклоњене&lt;/b&gt; из локалног фајл-система и више се неће синхронизовати на овом рачунару</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Одустани</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Повезан са &lt;server&gt; као &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Није подешен налог.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Потврда уклањања фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Потврда ресетовања фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Заиста желите да ресетујете фасциклу &lt;i&gt;%1&lt;/i&gt; и поново изградите базу клијента?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Напомена:&lt;/b&gt; Ова функција је намењена за сврху одржавања. Фајлови неће бити уклоњени, али ово може узроковати значајан пренос података и може трајати неколико минута или сати док се заврши, зависно од величине фасцикле. Користите ову опцију само ако вам је тако саветовао администратор.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Синхронизација у току</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Синхронизација је у току.&lt;br/&gt;Желите ли да је прекинете?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) од %2 простора искоришћено.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation>Тренутно нема доступних података о заузећу складишта.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Нема подешене %1 везе.</translation>
</message>
@@ -750,8 +767,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Додај фасциклу</translation>
</message>
@@ -817,22 +834,27 @@ Total time left %5</source>
<translation>Нисам успео да направим фасциклу на %1. Проверите ручно.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Ово изаберите да синхронизујете целокупан налог</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Ова фасцикла се већ синхронизује.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Већ синхронизујете &lt;i&gt;%1&lt;/i&gt;, која садржи фасциклу &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Већ синхронизујете све ваше фајлове. Синхронизација других фасцикли &lt;b&gt;није&lt;/b&gt; подржана. Ако желите синхронизацију више фасцикли, уклоните тренутно подешену корену фасциклу.</translation>
</message>
@@ -840,7 +862,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Изаберите шта синхронизујете. Можете искључити удаљене фасцикле које не желите да синхронизујете.</translation>
</message>
@@ -1368,8 +1390,8 @@ for additional privileges during the process.</source>
<translation>Синхронизација локалне фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1984,22 +2006,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Неозначене фасцикле биће &lt;b&gt;уклоњене&lt;/b&gt; из локалног фајл-система и више се неће синхронизовати на овом рачунару</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Изаберите шта синхронизујете. Изаберите удаљене фасцикле које желите да синхронизујете.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Изаберите шта синхронизујете. Избаците удаљене фасцикле које не желите да синхронизујете.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Изаберите шта синхронизовати</translation>
</message>
@@ -2022,13 +2044,13 @@ It is not advisable to use it.</source>
<translation>величина</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>На серверу тренутно нема потфасцикли.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Дошло је до грешке при учитавању листе потфасикли.</translation>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 71df28d93..0f7785483 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -89,22 +89,29 @@
<translation>Ta bort</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>De mappar som inte väljs kommer att &lt;b&gt;raderas&lt;/b&gt; 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="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Tillämpa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Ansluten till &lt;server&gt; som &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Inget konto är konfigurerat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Bekräfta radering av mapp</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Bekräfta återställning av mapp</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vill du verkligen nollställa mappen &lt;i&gt;%1&lt;/i&gt; och återställa din databas?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Notera:&lt;/b&gt; Denna funktion är endast designad för underhållsuppgifter. Inga filer raderas, men kan skapa mycket datatrafik och ta allt från några minuter till flera timmar att slutföra, beroende på storleken på mappen. Använd endast detta alternativ om du har blivit uppmanad av din systemadministratör.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Synkronisering pågår</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>En synkronisering pågår.&lt;br/&gt;Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) av %2 server utrymme används.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
@@ -750,8 +767,8 @@ Total tid kvar %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Lägg till mapp</translation>
</message>
@@ -817,22 +834,27 @@ Total tid kvar %5</translation>
<translation>Det gick inte att skapa mappen på %1. Kontrollera manuellt.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Välj detta för att synka allt</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Denna mappen synkas redan.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Du synkar redan &lt;i&gt;%1&lt;/i&gt;, vilket är övermapp till &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Du synkroniserar redan alla dina filer. Synkronisering av en annan mapp stöds &lt;b&gt;ej&lt;/b&gt;. Om du vill synka flera mappar, ta bort den för tillfället konfigurerade rotmappen från synk.</translation>
</message>
@@ -840,7 +862,7 @@ Total tid kvar %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Välj Vad du vill Synka: Du har även möjlighet att avmarkera mappar på servern som du ej vill synkronisera.</translation>
</message>
@@ -1367,8 +1389,8 @@ for additional privileges during the process.</source>
<translation>Lokal mapp för synkning</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1977,22 +1999,22 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>De mappar som inte väljs kommer att &lt;b&gt;raderas&lt;/b&gt; från det lokala filsystemet och kommer inte att synkroniseras till den här datorn längre.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Välj vad som ska synkas</translation>
</message>
@@ -2015,13 +2037,13 @@ Det är inte lämpligt använda den.</translation>
<translation>Storlek</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index 57b706017..a05209662 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -89,22 +89,29 @@
<translation>ลบ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>บางโฟลเดอร์รวมถึงเครือข่ายที่ติดตั้งหรือโฟลเดอร์ที่แชร์อาจจะมีข้อจำกัด ที่แตกต่างกัน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>โฟลเดอร์ที่ไม่ถูกตรวจสอบจะถูก &lt;b&gt;ลบ&lt;/b&gt; จากระบบแฟ้มต้นทางของคุณและจะไม่ประสานข้อมูลกับคอมพิวเตอร์เครื่องนี้อีกต่อไป</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>นำไปใช้</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>ยกเลิก</translation>
</message>
@@ -114,127 +121,137 @@
<translation>เชื่อมต่อกับ &lt;server&gt; ด้วยผู้ใช้ &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>ไม่มีการกำหนดค่าบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>ลบโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>สร้างโฟลเดอร์ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;ไม่สามารถสร้างโฟลเดอร์ต้นทาง &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>ยืนยันการลบโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>ยืนยันการรีเซ็ตโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;คุณต้องการที่จะตั้งค่าโฟลเดอร์ &lt;i&gt;%1&lt;/i&gt; และสร้างฐานข้อมูลไคลเอนต์ของคุณหรือไม่?&lt;/p&gt;&lt;p&gt;&lt;b&gt;หมายเหตุ:&lt;/b&gt;ฟังก์ชั่นนี้ถูกออกแบบมาเพื่อวัตถุประสงค์ในการซ่อมบำรุงเท่านั้น จะไม่มีไฟล์ที่ถูกลบออก แต่นี้อาจทำให้เกิดการจราจรข้อมูลที่สำคัญและใช้เวลาหลายนาทีหรือชั่วโมงขึ้นอยู่กับขนาดของโฟลเดอร์ ใช้ตัวเลือกนี้หากได้รับคำแนะนำจากผู้ดูแลระบบของคุณ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>กำลังประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>การดำเนินการเพื่อประสานข้อมูลกำลังทำงานอยู่ &lt;br/&gt;คุณต้องการสิ้นสุดการทำงานหรือไม่?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 เช่น &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>เชื่อมต่อกับ %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>เซิร์ฟเวอร์ %1 ไม่สามารถใช้ได้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>ลงชื่อออกจาก %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation>ไม่มีการเชื่อมต่อไปยัง %1 ที่ %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation>มีโฟลเดอร์ใหม่ที่ไม่ถูกประสานข้อมูลเพราะโฟลเดอร์มีขนาดใหญ่เกินไป: %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>หรือ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>ยืนยันการลบบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;คุณต้องการลบการเชื่อมต่อกับบัญชี&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;หมายเหตุ:&lt;/b&gt; นี้จะ &lt;b&gt;ไม่&lt;/b&gt; ลบไฟล์ใดๆ&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>%1 (%3%) จาก %2 พื้นที่เซิร์ฟเวอร์ที่ใช้งานอยู่</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation>เปิดโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation>ประสานข้อมูลอีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation>หยุดประสานข้อมูลชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;คุณต้องการที่จะหยุดการประสานข้อมูลโฟลเดอร์&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;หมายเหตุ:&lt;/b&gt; นี้จะ &lt;b&gt;ไม่&lt;/b&gt; ลบไฟล์ใดๆ&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation>ขณะนี้ไม่มีพื้นที่จัดเก็บข้อมูลที่ใช้งานได้</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
@@ -749,8 +766,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>เพิ่มโฟลเดอร์</translation>
</message>
@@ -816,22 +833,27 @@ Total time left %5</source>
<translation>ไม่สามารถสร้างโฟลเดอร์บน %1 กรุณาตรวจสอบด้วยตนเอง</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>เลือกตัวเลือกนี้เพื่อประสานข้อมูลบัญชีทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>โฟลเดอร์นี้ถูกประสานข้อมูลอยู่แล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>คุณประสานข้อมูล &lt;i&gt;%1&lt;/i&gt; อยู่แล้ว ซึ่งมีโฟลเดอร์หลักเป็น &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>คุณกำลังผสานข้อมูลไฟลืทั้งหมดอยู่แล้ว การผสานข้อมูลโฟลเดอร์อื่นๆ&lt;b&gt;ไม่&lt;/b&gt;ได้รับการสนับสนุน หากคุณต้องการประสานข้อมูลหลายโฟลเดอร์ กรุณาลบการกำหนดค่าผสานข้อมูลโฟลเดอร์รากในปัจจุบัน</translation>
</message>
@@ -839,7 +861,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>เลือกสิ่งที่จะประสานข้อมูล: คุณสามารถยกเลิกการเลือกโฟลเดอร์ย่อยระยะไกลของหากคุณไม่ต้องการประสานข้อมูล</translation>
</message>
@@ -1372,8 +1394,8 @@ for additional privileges during the process.</source>
<translation>ประสานโฟลเดอร์ต้นทาง</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1982,22 +2004,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>โฟลเดอร์ที่ไม่ถูกตรวจสอบจะถูก &lt;b&gt;ลบ&lt;/b&gt; จากระบบแฟ้มต้นทางของคุณและจะไม่ประสานข้อมูลกับคอมพิวเตอร์เครื่องนี้อีกต่อไป</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>เลือกสิ่งที่ต้องการประสานข้อมูล: เลือกโฟลเดอร์ย่อยระยะไกลที่คุณต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>เลือกสิ่งที่ต้องการประสานข้อมูล: ยกเลิกการเลือกโฟลเดอร์ย่อยระยะไกลที่คุณต้องการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>เลือกสิ่งที่ต้องการประสานข้อมูล</translation>
</message>
@@ -2020,13 +2042,13 @@ It is not advisable to use it.</source>
<translation>ขนาด</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>ไม่มีโฟลเดอร์ย่อยอยู่บนเซิร์ฟเวอร์</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>เกิดข้อผิดพลาดขณะโหลดรายชื่อของโฟลเดอร์ย่อย</translation>
</message>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 2aba75b2f..803b838ec 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -89,22 +89,29 @@
<translation>Sil</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Seçilmemiş klasörler yerel dosya sisteminizden &lt;b&gt;silinecek&lt;/b&gt; ve bir daha bu bilgisayarla eşitlenmeyecektir</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>Uygula</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
@@ -114,127 +121,137 @@
<translation>&lt;server&gt; ile &lt;user&gt; olarak bağlantı kuruldu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Hiçbir hesap yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Klasör Kaldırma İşlemini Onayla</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Klasör Sıfırlamayı Onayla</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Gerçekten &lt;i&gt;%1&lt;/i&gt; klasörünü sıfırlamak ve istemci veritabanını yeniden inşa etmek istiyor musunuz?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Not:&lt;/b&gt; Bu işlev sadece bakım amaçlı tasarlandı. Hiçbir dosya kaldırılmayacak, fakat bu işlem büyük veri trafiğine sebep olabilir ve klasör boyutuna bağlı olarak tamamlanması birkaç dakikadan birkaç saate kadar sürebilir. Bu seçeneği sadece yöneticiniz tarafından istenmişse kullanın.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Eşitleme Çalışıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Eşitleme işlemi devam ediyor.&lt;br/&gt;Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>Sunucudaki %2&apos;lık kotanın %1&apos;ı (%%3) kullanılıyor.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<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="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
</message>
@@ -750,8 +767,8 @@ Toplam kalan süre: %5</translation>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Klasör Ekle</translation>
</message>
@@ -817,22 +834,27 @@ Toplam kalan süre: %5</translation>
<translation>%1 üzerinde klasör oluşturma başarısız. Lütfen elle denetleyin.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Tüm hesabı eşitlemek için bunu seçin</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Bu klasör zaten eşitleniyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>&lt;i&gt;%1&lt;/i&gt; zaten eşitleniyor. Bu, &lt;i&gt;%2&lt;/i&gt; klasörünün üst klasörü.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Zaten tüm dosyalarınızı eşitliyorsunuz. Farklı bir klasör eşitlemek &lt;b&gt;desteklenmiyor&lt;/b&gt;. Eğer çoklu klasörleri eşitlemek isterseniz, lütfen şu anda yapılandırılmış kök klasör eşitlemesini kaldırın.</translation>
</message>
@@ -840,7 +862,7 @@ Toplam kalan süre: %5</translation>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Ne Eşitleneceğini Seçin: Eşitlemek istemediğiniz uzak alt klasörlerin seçimini isteğe bağlı olarak kaldırabilirsiniz.</translation>
</message>
@@ -1367,8 +1389,8 @@ for additional privileges during the process.</source>
<translation>Yerel Eşitleme Klasörü</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1981,22 +2003,22 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Seçilmemiş klasörler yerel dosya sisteminizden &lt;b&gt;silinecek&lt;/b&gt; ve bir daha bu bilgisayarla eşitlenmeyecektir</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Ne Eşitleneceğini Seçin: Eşitlemek istediğiniz uzak alt klasörleri seçin.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Ne Eşitleneceğini Seçin: Eşitlemek istemediğiniz uzak alt klasörlerin seçimini kaldırın.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Ne Eşitleneceğini Seçin</translation>
</message>
@@ -2019,13 +2041,13 @@ Kullanmanız önerilmez.</translation>
<translation>Boyut</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>Sunucuda şu anda alt dizin bulunmuyor.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Alt dizin listesi alınırken bir hata oluştu.</translation>
</message>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index 6bcd0bb30..ffa770e06 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -89,22 +89,29 @@
<translation>Видалити</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Не позначені теки будуть &lt;b&gt;видалені&lt;/b&gt; з вашої системи та більше не будуть синхронізуватися</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>Скасувати</translation>
</message>
@@ -114,127 +121,137 @@
<translation>Підключено до &lt;server&gt; як &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>Обліковий запис не налаштовано.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>Підтвердіть видалення каталогу</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>Підтвердіть скидання теки</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ви дійсно бажаєте скинути теку &lt;i&gt;%1&lt;/i&gt; та перебудувати клієнтську базу даних?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Зверніть увагу:&lt;/b&gt; Дана функція призначена лише для технічного обслуговування. Файли не будуть видалені, але, в залежності від розміру теки, операція може зайняти від кількох хвилин до кількох годин та може бути переданий великий обсяг даних. Використовуйте дану операцію лише за рекомендації адміністратора.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>Виконується синхронізація</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Виконується процедура синхронізації.&lt;br/&gt;Бажаєте відмінити?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>Використовується %1 (%3%) з %2 місця на сервері.</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation>На даний час немає відомостей про наповнення сховища.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>Жодного %1 підключення не налаштовано.</translation>
</message>
@@ -750,8 +767,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>Додати Теку</translation>
</message>
@@ -817,22 +834,27 @@ Total time left %5</source>
<translation>Не вдалося створити теку на %1. Будь ласка, перевірте вручну.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>Оберіть це для синхронізації всього облікового запису</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>Тека вже синхронізується.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>Тека &lt;i&gt;%1&lt;/i&gt; вже синхронізується, та вона є батьківською для &lt;i&gt;%2&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>Всі ваші файли синхронізуються. Синхронізація інших тек в цьому режимі &lt;b&gt;не&lt;/b&gt; підтримується. Якщо вам необхідно синхронізувати декілька локальних каталогів, спочатку видаліть синхронізацію батьківської теки.</translation>
</message>
@@ -840,7 +862,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>Оберіть, що Синхронізувати: Ви можете вимкнути синхронізацію для деяких підкаталогів.</translation>
</message>
@@ -1367,8 +1389,8 @@ for additional privileges during the process.</source>
<translation>Локальна Тека для Синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1983,22 +2005,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>Не позначені теки будуть &lt;b&gt;видалені&lt;/b&gt; з вашої системи та більше не будуть синхронізуватися</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>Виберіть Що Синхронізувати: Виберіть папки на віддаленому сервері, які Ви хотіли б синхронізувати.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>Виберіть Що Синхронізувати: Зніміть вибір папок на віддаленому сервері, які Ви не хочете синхронізувати.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>Оберіть, що хочете синхронізувати</translation>
</message>
@@ -2021,13 +2043,13 @@ It is not advisable to use it.</source>
<translation>Розмір</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>На сервері зараз немає підтек.</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>Виникла помилка, поки завантажувався перелік підтек.</translation>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 9132381ac..a3b178701 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -89,22 +89,29 @@
<translation>删除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>一些文件夹,例如共享文件夹或网络挂载文件夹,可能有不同的限制。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>取消选中的文件夹将会从本地&lt;b&gt;删除&lt;/b&gt;,并不再同步到这台电脑上。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>应用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -114,127 +121,137 @@
<translation>&lt;user&gt; 已经连接到 &lt;server&gt; </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>没有配置的帐号。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation>移除文件夹</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation>文件夹创建失败</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;无法创建文件夹 &lt;i&gt;%1&lt;/i&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>确认移除文件夹</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>确认文件夹重置</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation>&lt;p&gt;您真希望重置文件夹 &lt;i&gt;%1&lt;/i&gt; 并重新构建您的客户端数据库吗?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt;此功能设计仅用作维护操作。没有文件将被移除,但这将导致大量的数据传输。根据文件夹的大小,这一过程将持续几分钟到几小时。请仅在管理员指导的情况下使用此功能。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>同步正在运行</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>正在执行同步。&lt;br /&gt;您确定要关闭它吗?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation>连接到 %1。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>远程服务器%1暂时不可用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation>从 %1 登出</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>,</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation>确认删除账户</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>已使用 %3% 的服务器空间 (%1 / %2)</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation>目前没有储存使用量信息可用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
@@ -750,8 +767,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>增加目录</translation>
</message>
@@ -817,22 +834,27 @@ Total time left %5</source>
<translation>无法在 %1 处创建文件夹。请自行检查。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation>选择此项以同步整个账户</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>文件夹已在同步中。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation>你已经在同步 &lt;i&gt;%1&lt;/i&gt;,&lt;i&gt;%2&lt;/i&gt; 是它的一个子文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation>你已经设置同步了你的所有文件,无法同步另一文件夹。要同步多个文件夹,请取消当前设置的根文件夹同步。</translation>
</message>
@@ -840,7 +862,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation>选择同步内容(取消选中不需同步的远程子文件夹)</translation>
</message>
@@ -1367,8 +1389,8 @@ for additional privileges during the process.</source>
<translation>本地同步文件夹</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1978,22 +2000,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation>取消选中的文件夹将会从本地&lt;b&gt;删除&lt;/b&gt;,并不再同步到这台电脑上。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation>选择同步内容(选中需同步的远程子文件夹)</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation>选择同步内容(取消选中不需同步的远程子文件夹)</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>选择同步内容</translation>
</message>
@@ -2016,13 +2038,13 @@ It is not advisable to use it.</source>
<translation>大小</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation>这个服务器上暂不存在子文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation>载入子文件夹列表时发生错误。</translation>
</message>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index 3e885307f..ad69d2472 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -89,22 +89,29 @@
<translation>刪除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="108"/>
+ <location filename="../src/gui/accountsettings.ui" line="92"/>
<source>Some folders, including network mounted or shared folders, might have different limits.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="157"/>
+ <location filename="../src/gui/accountsettings.ui" line="95"/>
+ <source>Storage space: ...</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.ui" line="166"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="188"/>
+ <location filename="../src/gui/accountsettings.ui" line="197"/>
<source>Apply</source>
<translation>套用</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.ui" line="201"/>
+ <location filename="../src/gui/accountsettings.ui" line="210"/>
+ <location filename="../src/gui/accountsettings.cpp" line="256"/>
+ <location filename="../src/gui/accountsettings.cpp" line="523"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -114,127 +121,137 @@
<translation>以 &lt;user&gt; 的身分連接 &lt;server&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="128"/>
+ <location filename="../src/gui/accountsettings.cpp" line="115"/>
<source>No account configured.</source>
<translation>沒有設置帳號。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="162"/>
+ <location filename="../src/gui/accountsettings.cpp" line="149"/>
<source>Remove folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="214"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Folder creation failed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="215"/>
+ <location filename="../src/gui/accountsettings.cpp" line="202"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="263"/>
+ <location filename="../src/gui/accountsettings.cpp" line="249"/>
<source>Confirm Folder Remove</source>
<translation>資料夾移除確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="290"/>
+ <location filename="../src/gui/accountsettings.cpp" line="255"/>
+ <source>Stop syncing</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="281"/>
<source>Confirm Folder Reset</source>
<translation>資料夾重設確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="291"/>
+ <location filename="../src/gui/accountsettings.cpp" line="282"/>
<source>&lt;p&gt;Do you really want to reset folder &lt;i&gt;%1&lt;/i&gt; and rebuild your client database?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This function is designed for maintenance purposes only. No files will be removed, but this can cause significant data traffic and take several minutes or hours to complete, depending on the size of the folder. Only use this option if advised by your administrator.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="371"/>
+ <location filename="../src/gui/accountsettings.cpp" line="362"/>
<source>Sync Running</source>
<translation>正在同步中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="372"/>
+ <location filename="../src/gui/accountsettings.cpp" line="363"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>正在同步中&lt;br/&gt;你真的想要中斷?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="455"/>
+ <location filename="../src/gui/accountsettings.cpp" line="419"/>
+ <source>Storage space: %1 (%3%) of %2 in use</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/accountsettings.cpp" line="441"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="459"/>
+ <location filename="../src/gui/accountsettings.cpp" line="445"/>
<source>Connected to %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="461"/>
+ <location filename="../src/gui/accountsettings.cpp" line="447"/>
<source>Server %1 is temporarily unavailable.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="463"/>
+ <location filename="../src/gui/accountsettings.cpp" line="449"/>
<source>Signed out from %1.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="465"/>
+ <location filename="../src/gui/accountsettings.cpp" line="451"/>
<source>No connection to %1 at %2.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="500"/>
+ <location filename="../src/gui/accountsettings.cpp" line="486"/>
<source>There are new folders that were not synchronized because they are too big: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="501"/>
+ <location filename="../src/gui/accountsettings.cpp" line="487"/>
<source>, </source>
<translation>, </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="525"/>
+ <location filename="../src/gui/accountsettings.cpp" line="515"/>
<source>Confirm Account Delete</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="526"/>
+ <location filename="../src/gui/accountsettings.cpp" line="516"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="431"/>
- <source>%1 (%3%) of %2 server space in use.</source>
- <translation>已使用 %2 中的 %1 (%3%) 伺服器空間。</translation>
+ <location filename="../src/gui/accountsettings.cpp" line="522"/>
+ <source>Remove connection</source>
+ <translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="158"/>
+ <location filename="../src/gui/accountsettings.cpp" line="145"/>
<source>Open folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Resume sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="160"/>
+ <location filename="../src/gui/accountsettings.cpp" line="147"/>
<source>Pause sync</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="264"/>
+ <location filename="../src/gui/accountsettings.cpp" line="250"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="436"/>
+ <location filename="../src/gui/accountsettings.cpp" line="422"/>
<source>Currently there is no storage usage information available.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="471"/>
+ <location filename="../src/gui/accountsettings.cpp" line="457"/>
<source>No %1 connection configured.</source>
<translation>沒有 %1 連線設置。</translation>
</message>
@@ -747,8 +764,8 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizard</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="551"/>
- <location filename="../src/gui/folderwizard.cpp" line="553"/>
+ <location filename="../src/gui/folderwizard.cpp" line="562"/>
+ <location filename="../src/gui/folderwizard.cpp" line="564"/>
<source>Add Folder</source>
<translation>新增資料夾</translation>
</message>
@@ -814,22 +831,27 @@ Total time left %5</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="345"/>
+ <location filename="../src/gui/folderwizard.cpp" line="271"/>
+ <source>Failed to list a folder. Error: %1</source>
+ <translation type="unfinished"/>
+ </message>
+ <message>
+ <location filename="../src/gui/folderwizard.cpp" line="351"/>
<source>Choose this to sync the entire account</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="449"/>
+ <location filename="../src/gui/folderwizard.cpp" line="460"/>
<source>This folder is already being synced.</source>
<translation>這個資料夾已經被同步了。</translation>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="451"/>
+ <location filename="../src/gui/folderwizard.cpp" line="462"/>
<source>You are already syncing &lt;i&gt;%1&lt;/i&gt;, which is a parent folder of &lt;i&gt;%2&lt;/i&gt;.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="455"/>
+ <location filename="../src/gui/folderwizard.cpp" line="466"/>
<source>You are already syncing all your files. Syncing another folder is &lt;b&gt;not&lt;/b&gt; supported. If you want to sync multiple folders, please remove the currently configured root folder sync.</source>
<translation type="unfinished"/>
</message>
@@ -837,7 +859,7 @@ Total time left %5</source>
<context>
<name>OCC::FolderWizardSelectiveSync</name>
<message>
- <location filename="../src/gui/folderwizard.cpp" line="493"/>
+ <location filename="../src/gui/folderwizard.cpp" line="504"/>
<source>Choose What to Sync: You can optionally deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
@@ -1364,8 +1386,8 @@ for additional privileges during the process.</source>
<translation>本地同步資料夾</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="269"/>
- <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="290"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="285"/>
+ <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="306"/>
<source>(%1)</source>
<translation>(%1)</translation>
</message>
@@ -1973,22 +1995,22 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SelectiveSyncDialog</name>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="363"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="381"/>
<source>Unchecked folders will be &lt;b&gt;removed&lt;/b&gt; from your local file system and will not be synchronized to this computer anymore</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="377"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="395"/>
<source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="378"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="396"/>
<source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="384"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
<source>Choose What to Sync</source>
<translation>選擇要同步的項目</translation>
</message>
@@ -2011,13 +2033,13 @@ It is not advisable to use it.</source>
<translation>大小</translation>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="169"/>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="216"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="191"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="229"/>
<source>No subfolders currently on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="218"/>
+ <location filename="../src/gui/selectivesyncdialog.cpp" line="231"/>
<source>An error occured while loading the list of sub folders.</source>
<translation type="unfinished"/>
</message>