[tx-robot] updated from transifex

author Jenkins for ownCloud <owncloud-bot@tmit.eu>

Mon, 29 Feb 2016 17:10:28 +0000 (12:10 -0500)

committer Jenkins for ownCloud <owncloud-bot@tmit.eu>

Mon, 29 Feb 2016 17:10:28 +0000 (12:10 -0500)
author Jenkins for ownCloud <owncloud-bot@tmit.eu>
Mon, 29 Feb 2016 17:10:28 +0000 (12:10 -0500)
committer Jenkins for ownCloud <owncloud-bot@tmit.eu>
Mon, 29 Feb 2016 17:10:28 +0000 (12:10 -0500)
diff --git a/translations/client_ca.ts b/translations/client_ca.ts

index c2a1a456cf3e34fa8c5bfd8615f3a8ec4c98c2ec..be2158966231c8cb3c0179761bcecc1b31c6a759 100644 (file)
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Cancel·la</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Compte</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Trieu què sincronitzar</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Ha fallat la creació de la carpeta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>S&apos;està sincronitzant</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Connectat a %1</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <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="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>S&apos;ha desconnectat de %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <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="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Inici de sessió</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Elimina la connexió</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Surt</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Continua la sincronització</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Pausa la sincronització</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) de %2 en ús. Algunes carpetes, incloent les carpetes muntades a través de xarxa o les compartides, poden tenir límits diferents.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 de %2 en ús</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>La connexió %1 no està configurada.</translation>
      </message>
@@ -625,46 +625,46 @@ Please go in the settings to select it if you wish to download it.</source>
  Aneu a arranjament per seleccionar-la si voleu descarregar-la.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Esborra tots els fitxers?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Esborra tots els fitxers</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Mantén els fitxers</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1074,7 +1074,7 @@ Temps restant total %5</translation>
          <translation>El servidor retorna un error de contingut o rang</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Temps de connexió excedit</translation>
      </message>
@@ -1839,37 +1839,37 @@ No és aconsellada usar-la.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>El fitxer %1 no es pot baixar perquè hi ha un xoc amb el nom d&apos;un fitxer local!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>El fitxer s&apos;ha esborrat del servidor</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>El fitxer ha canviat des de que es va descobrir</translation>
      </message>
@@ -2135,22 +2135,22 @@ No és aconsellada usar-la.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Trieu què sincronitzar</translation>
      </message>
@@ -2173,15 +2173,15 @@ No és aconsellada usar-la.</translation>
          <translation>Mida</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <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>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2411,7 +2411,7 @@ No és aconsellada usar-la.</translation>
      <message>
          <location filename="../src/gui/shareusergroupwidget.cpp" line="270"/>
          <source>change</source>
-        <translation>cambi</translation>
+        <translation>canvi</translation>
      </message>
      <message>
          <location filename="../src/gui/shareusergroupwidget.cpp" line="272"/>
@@ -2746,6 +2746,11 @@ No és aconsellada usar-la.</translation>
          <source>Error while reading folder.</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2837,11 +2842,6 @@ No és aconsellada usar-la.</translation>
          <source>Filename is too long.</source>
          <translation>El nom de fitxer és massa llarg.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>El fitxer s&apos;ignora perquè és ocult.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts

index 5b8d77bda7382f23cc78bf3001b16d91baab4f58..3400e4cdee0c8b66dc74ba0e85a46b6a3ec981cc 100644 (file)
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Zrušit</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Účet</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Vybrat co sesynchronizovat</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Odstranit připojení synchronizace adresáře</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Vytvoření adresáře selhalo</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Potvrdit odstranění připojení synchronizace adresáře</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Odstranit připojení synchronizace adresáře</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Synchronizace probíhá</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 používaný</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Připojeno k %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Server %1 je dočasně nedostupný.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Odhlášeno z %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <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="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Přihlásit</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Jsou dostupné nové adresáře, které nebyly synchronizovány z důvodu jejich nadměrné velikosti:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Potvrdit odstranění účtu</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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;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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Odstranit připojení</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Odhlásit se</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Pokračovat v synchronizaci</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Pozastavit synchronizaci</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>Používaných %1 (%3%) z %2. Některé adresáře včetně připojených síťových  nebo sdílených adresářů mohou mít odlišné limity.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>Používaných %1 z %2</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Žádné spojení s %1 nenastaveno.</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Pokud ho chcete stáhnout, přejděte prosím do nastavení a označte ho.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,22 +633,22 @@ Toto může být způsobeno změnou v nastavení synchronizace složky nebo tím
  Opravdu chcete provést tuto akci?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Odstranit všechny soubory?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Odstranit všechny soubory</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Ponechat soubory</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -657,17 +657,17 @@ Toto může být způsobeno obnovením zálohy na straně serveru.
  Pokračováním v synchronizaci způsobí přepsání všech vašich souborů staršími soubory z dřívějšího stavu. Přejete si ponechat své místní nejaktuálnější soubory jako konfliktní soubory?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>Záloha nalezena</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>Normální synchronizace</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation>Ponechat místní soubory jako konflikt</translation>
      </message>
@@ -1077,7 +1077,7 @@ Celkový zbývající čas %5</translation>
          <translation>Server odpověděl chybným rozsahem obsahu</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Čas spojení vypršel</translation>
      </message>
@@ -1844,37 +1844,37 @@ Nedoporučuje se jí používat.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Soubor %1 nemohl být stažen z důvodu kolize názvu se souborem v místním systému!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>Stažení by snížilo velikost volného místa na disku pod %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Volné místo na disku je méně než %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Soubor byl smazán ze serveru</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Soubor nemohl být kompletně stažen.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Soubor %1 nemohl být uložen z důvodu kolize názvu se souborem v místním systému!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Soubor se mezitím změnil</translation>
      </message>
@@ -2146,22 +2146,22 @@ Nedoporučuje se jí používat.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Vybrat co synchronizovat</translation>
      </message>
@@ -2184,15 +2184,15 @@ Nedoporučuje se jí používat.</translation>
          <translation>Velikost</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Došlo k chybě v průběhu načítání seznamu podadresářů.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2757,6 +2757,11 @@ Nedoporučuje se jí používat.</translation>
          <source>Error while reading folder.</source>
          <translation>Chyba při čtení adresáře.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2848,11 +2853,6 @@ Nedoporučuje se jí používat.</translation>
          <source>Filename is too long.</source>
          <translation>Jméno souboru je moc dlouhé.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Soubor je ignorován, protože je skrytý.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
@@ -3362,7 +3362,7 @@ Nedoporučuje se jí používat.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
          <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>V budoucnosti</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3372,7 +3372,7 @@ Nedoporučuje se jí používat.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
          <source>now</source>
-        <translation type="unfinished"/>
+        <translation>nyní</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="460"/>
diff --git a/translations/client_de.ts b/translations/client_de.ts

index 303a742fa082700c91d4b6a9cc86ed4101e664cc..294c7a4991179a6ea6fe562afe82e5b3bd48c4be 100644 (file)
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Abbrechen</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Benutzerkonto</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Zu synchronisierende Elemente auswählen</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Ordner Synchronisation entfernen</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Ordner anlegen fehlgeschlagen</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
          <translation>&lt;p&gt;Konnte lokalen Ordner &lt;i&gt;%1&lt;/i&gt; nicht anlegen.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Bestätigen Sie die Löschung der Ordner Sychronisation</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Ordner Synchronisation entfernen</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Synchronisation läuft</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 wird verwendet</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Verbunden mit %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Server %1 ist derzeit nicht verfügbar.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Abgemeldet von %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>Keine Verbindung zu %1 auf %2</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Einloggen</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Einige neue Ordner konnten nicht synchronisiert werden, da sie zu groß sind:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Konto wirklich entfernen?</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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;Wollen Sie wirklich die Verbindung zum Konto &lt;i&gt;%1&lt;/i&gt; lösen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anmerkung:&lt;/b&gt; Dieser Vorgang wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Verbindung entfernen</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Abmelden</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Synchronisation fortsetzen</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Synchronisation pausieren</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;Möchten Sie wirklich die Synchronisation des Ordners &lt;i&gt;%1&lt;/i&gt; stoppen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anmerkung:&lt;/b&gt; Dies wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) von %2 Serverkapazität verwendet. Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner oder geteilte ordner können unterschiedliche Beschränkungen aufweisen. </translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 von %2 Serverkapazität verwendet</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Keine %1-Verbindung konfiguriert.</translation>
      </message>
@@ -623,7 +623,7 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation>Ein neue Order größer als %1 MB wurde hinzugefügt: %2. Bitte besuchen Sie die Einstellungen, falls sie ihn herunterladen wollen.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -632,22 +632,22 @@ Die Ursache ist, dass der Ordner entweder neu konfiguriert wurde, oder weil alle
  Sind Sie sicher, dass Sie diese Operation durchführen möchten?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Alle Dateien löschen?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Lösche alle Dateien</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Dateien behalten</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -656,17 +656,17 @@ Der Grund dafür ist möglicherweise, dass auf dem Server ein Backup eingespielt
  Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älteren Versionen überschrieben. Möchten Sie die neueren Dateien als Konflikt-Dateien behalten?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>Backup erkannt</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>Normale Synchronisation</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation>Lokale Konfliktdateien behalten</translation>
      </message>
@@ -1076,7 +1076,7 @@ Gesamtzeit übrig %5</translation>
          <translation>Server hat falschen Bereich für den Inhalt zurück gegeben</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Zeitüberschreitung der Verbindung</translation>
      </message>
@@ -1842,37 +1842,37 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht herunter geladen werden!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>Dieser Download würde den freien Speicher der Festplatte minimieren auf %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Der freie Speicher auf der Festplatte ist weniger als %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Die Datei wurde vom Server gelöscht</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Die Datei konnte nicht vollständig herunter geladen werden.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Die Datei %1 kann aufgrund eines Konfliktes mit dem lokalen Dateinamen nicht gespeichert geladen werden!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Datei ist seit der Entdeckung geändert worden</translation>
      </message>
@@ -2143,22 +2143,22 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Zu synchronisierende Elemente auswählen</translation>
      </message>
@@ -2181,15 +2181,15 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
          <translation>Größe</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Ein Fehler ist aufgetreten, während die Liste der Unterordner geladen wurde.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2754,6 +2754,11 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
          <source>Error while reading folder.</source>
          <translation>Fehler beim Lesen eines Ordners.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2845,11 +2850,6 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
          <source>Filename is too long.</source>
          <translation>Der Dateiname ist zu lang.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Datei wird ignoriert, weil sie versteckt ist.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_el.ts b/translations/client_el.ts

index 14f620c2bb52fefae4b6617cf324b0f4145b0098..dfd6bc3c78899575ff68ab83e949b6a0dc0de6f8 100644 (file)
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Άκυρο</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Λογαριασμός</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Επιλέξτε τι θα συγχρονιστεί</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Αποτυχία αφαίρεσης φακέλου</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Επιβεβαίωση αφαίρεσης σύνδεσης συγχρονισμού φακέλου</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Εκτελείται Συγχρονισμός </translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 σε χρήση</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Συνδεδεμένο με %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Ο διακομιστής %1 δεν είναι διαθέσιμος προσωρινά.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Αποσυνδέθηκε από %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>Δεν υπάρχει σύνδεση με το %1 στο %2.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Είσοδος</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Υπάρχουν νέοι φάκελοι που δεν συγχρονίστηκαν καθώς είναι πολύ μεγάλοι:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Αφαίρεση σύνδεσης</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Αποσύνδεση</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Συνέχιση συγχρονισμού</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Παύση συγχρονισμού</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) από %2 σε χρήση. Μερικοί φάκελοι, συμπεριλαμβανομένων των δικτυακών ή των κοινόχρηστων μπορεί να έχουν διαφορετικά όρια.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 από %2 σε χρήση</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Παρακαλούμε πηγαίνετε στις ρυθμίσεις για να επιλέξετε αν επιθυμείτε να τον κατεβάσετε.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,39 +633,39 @@ Are you sure you want to perform this operation?</source>
  Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Αφαίρεση Όλων των Αρχείων;</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Αφαίρεση όλων των αρχείων</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Διατήρηση αρχείων</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1076,7 +1076,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation>Ο διακομιστής επέστρεψε εσφαλμένο πεδίο τιμών</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Λήξη Χρόνου Αναμονής Σύνδεσης</translation>
      </message>
@@ -1843,37 +1843,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Το αρχείο %1 δεν είναι δυνατό να ληφθεί λόγω διένεξης με το όνομα ενός τοπικού αρχείου!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>Η λήψη θα μειώσει το διαθέσιμο χώρο στο δίσκο κάτω από %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Ο διαθέσιμος χώρος στο δίσκο είναι λιγότερος από %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Το αρχείο διαγράφηκε από τον διακομιστή</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Η λήψη του αρχείου δεν ολοκληρώθηκε.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Το αρχείο %1 δεν είναι δυνατό να αποθηκευτεί λόγω διένεξης με το όνομα ενός τοπικού ονόματος αρχείου!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Το αρχείο έχει αλλάξει από όταν ανακαλύφθηκε</translation>
      </message>
@@ -2145,22 +2145,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
          <translation>Επιλέξτε Τι θα Συγχρονιστεί: Επιλέξτε τους απομακρυσμένους υποφακέλους που επιθυμείτε να συγχρονίσετε.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Επιλέξτε Τι θα Συγχρονιστεί</translation>
      </message>
@@ -2183,15 +2183,15 @@ It is not advisable to use it.</source>
          <translation>Μέγεθος</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>Δεν υπάρχουν υποφάκελοι αυτή τη στιγμή στον διακομιστή.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Προέκυψε σφάλμα κατά τη φόρτωση της λίστας υποφακέλων.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2756,6 +2756,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation>Σφάλμα κατά την ανάγνωση του φακέλου.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2847,11 +2852,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Το αρχείο αγνοήθηκε επειδή είναι κρυφό.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_en.ts b/translations/client_en.ts

index fc233950b1e602790ddbbded6bb17856471dfb91..f7f807a95597bdaa4a38511d04d7b79c6f88a611 100644 (file)
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -94,8 +94,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation type="unfinished"></translation>
      </message>
@@ -125,97 +125,97 @@
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation type="unfinished"></translation>
      </message>
@@ -226,42 +226,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation type="unfinished"></translation>
      </message>
@@ -625,46 +625,46 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder &apos;%1&apos;.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder &apos;%1&apos;.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"></translation>
      </message>
@@ -1076,7 +1076,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation type="unfinished"></translation>
      </message>
@@ -1835,37 +1835,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation type="unfinished"></translation>
      </message>
@@ -2137,22 +2137,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation type="unfinished"></translation>
      </message>
@@ -2175,14 +2175,14 @@ It is not advisable to use it.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation type="unfinished"></translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
          <translation type="unfinished"></translation>
      </message>
  </context>
@@ -2746,6 +2746,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation type="unfinished"></translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"></translation>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2837,11 +2842,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation type="unfinished"></translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"></translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_es.ts b/translations/client_es.ts

index f21c65e3e02d411779905c9f1356e71ef7719538..6b411e9d8f5950c3efae952dab480e3e31ddfce1 100644 (file)
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Cancelar</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Cuenta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Elija qué sincronizar</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Eliminar la sincronización de carpetas conectadas</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Hubo un fallo al crear la carpeta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Confirme la sincronización para la eliminación de la carpeta conectada</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Eliminar carpeta de sincronización conectada</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Sincronización en curso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 en uso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Conectado a %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Servidor %1 no está disponible temporalmente.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Cerró sesión desde %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <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="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Ingresar</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Hay carpetas nuevas que no fueron sincronizadas porque son demasiado grandes:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Confirmar eliminación de cuenta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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;¿De verdad quiere eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; eliminará los archivos.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Eliminar conexión</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Cerrar sesión</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Continuar sincronización</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Pausar sincronización</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;¿De verdad quiere dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; elminará los archivo.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) de %2 en uso. Algunas carpetas, como carpetas de red o compartidas, podrían tener límites diferentes.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 de %2 en uso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>No hay ninguna conexión de %1 configurada.</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Por favor diríjase a los ajustes para seleccionarlo si desea descargarlo.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,41 +633,43 @@ Esto se puede deber a que la carpeta fue reconfigurada de forma silenciosa o a q
  ¿Está seguro de que desea realizar esta operación?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>¿Eliminar todos los archivos?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Eliminar todos los archivos</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Conservar archivos</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
-        <translation type="unfinished"/>
+        <translation>Esta sincronización reseteará el estado de los archivos en la carpeta &apos;%1&apos;.
+esto es similar a restaurar un backup en el servidor.
+Continuar con la sincronización hará que todos los archivos sean sobreescritos con versiones anteriores de los mismos. Desea mantener los archivos locales sin cambios en caso de conflicto?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>Backup detectado</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>Sincronización Normal</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Mantener los archivos locales en caso de conflicto</translation>
      </message>
  </context>
  <context>
@@ -1075,7 +1077,7 @@ Tiempo restante %5</translation>
          <translation>El servidor ha devuelto un content-range erróneo</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Tiempo de espera de conexión agotado</translation>
      </message>
@@ -1841,37 +1843,37 @@ No se recomienda usarla.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>¡El archivo %1 no se puede descargar a causa de un conflicto con el nombre de un archivo local!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>La descarga reduciría el espacio libre en disco por debajo de %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>El espacio libre en el disco es inferior a %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Se ha eliminado el archivo del servidor</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>No se ha podido descargar el archivo completamente.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>¡El fichero %1 no puede guardarse debido a un conflicto con el nombre de otro fichero local!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>El archivo ha cambiado desde que fue descubierto</translation>
      </message>
@@ -2140,22 +2142,22 @@ No se recomienda usarla.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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 este ordenador</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Escoja qué sincronizar</translation>
      </message>
@@ -2178,15 +2180,15 @@ No se recomienda usarla.</translation>
          <translation>Tamaño</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Ocurrió un error cuando se cargaba la lista de subcarpetas.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2751,6 +2753,11 @@ No se recomienda usarla.</translation>
          <source>Error while reading folder.</source>
          <translation>Error al leer el directorio.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2842,11 +2849,6 @@ No se recomienda usarla.</translation>
          <source>Filename is too long.</source>
          <translation>El nombre del archivo es demasiado largo.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Archivo es ignorado porque está oculto.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
@@ -3356,7 +3358,7 @@ No se recomienda usarla.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
          <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>en el futuro</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3366,7 +3368,7 @@ No se recomienda usarla.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
          <source>now</source>
-        <translation type="unfinished"/>
+        <translation>ahora</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="460"/>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts

index 48911eef72e73cf9ac079f97f4baabc06917bab5..f01fa00d7e4ac2e4fd60493a6a10e27d067041d8 100644 (file)
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Cancelar</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Cuenta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Falló la creacion de la carpeta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
          <translation>&lt;p&gt;No pudó ser creada la carpeta local &lt;i&gt;%1&lt;/i&gt;.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Sincronización en curso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
          <translation>%1 de &lt;i&gt;%2&lt;/i&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Conectado a %1</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>El servidor %1 esta temporalmente sin conexión</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Registrado desde %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>Sin conexión a %1 desde %2.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Iniciar sesión</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Confirmar la eliminación de la cuenta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Eliminar conexión</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Cerrar la sesión</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Reanudar sincronización</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Pausar sincronización</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;Realmente quieres detener la sincronización de la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; eliminara ningun archivo.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 de %2 en uso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>No hay ninguna conexión de %1 configurada.</translation>
      </message>
@@ -623,46 +623,46 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>¿Borrar todos los archivos?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Borrar todos los archivos</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Conservar archivos</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1071,7 +1071,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation type="unfinished"/>
      </message>
@@ -1830,37 +1830,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation type="unfinished"/>
      </message>
@@ -2126,22 +2126,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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>Deseleccionar Carpetas que serán &lt;b&gt;eliminadas&lt;/b&gt; de su sistema de archivos local y no será sincronizado más en este equipo</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Elige </translation>
      </message>
@@ -2164,14 +2164,14 @@ It is not advisable to use it.</source>
          <translation>Tamaño</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
          <translation type="unfinished"/>
      </message>
  </context>
@@ -2735,6 +2735,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2826,11 +2831,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation type="unfinished"/>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_et.ts b/translations/client_et.ts

index 158861a00860633c34b8449f8462aa2782f0fa35..5ad7837ef2f2bb19a2788d7dc422bee74bff0b30 100644 (file)
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Loobu</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Konto</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Vali, mida sünkroniseerida</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Kausta loomine ebaõnnestus</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Sünkroniseerimine on käimas</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 kasutusel</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Ühendatud %1</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Server %1 pole ajutiselt saadaval.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Logi sisse</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Kinnita konto eemaldamine</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Eemalda ühendus</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Logi välja</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Taasta sünroonimist</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Peata sünkroonimine</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Ühtegi %1 ühendust pole seadistatud.</translation>
      </message>
@@ -623,46 +623,46 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Kustutada kõik failid?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Kustutada kõik failid</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Säilita failid</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>Leiti varukoopia</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>Tavaline sünkroonimine</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1072,7 +1072,7 @@ Aega kokku jäänud %5</translation>
          <translation>Server tagastas vale vahemiku</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Ühenduse aegumine</translation>
      </message>
@@ -1832,37 +1832,37 @@ Selle kasutamine pole soovitatav.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Faili %1 ei saa alla laadida kuna on konflikt kohaliku faili nimega.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Fail on serverist kustutatud</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Faili täielik allalaadimine ebaõnnestus.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Faili %1 ei saa salvestada kuna on nime konflikt kohaliku failiga!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Faili on pärast avastamist muudetud</translation>
      </message>
@@ -1890,7 +1890,7 @@ Selle kasutamine pole soovitatav.</translation>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
          <source>could not delete file %1, error: %2</source>
-        <translation type="unfinished"/>
+        <translation>ei saa kustutada faili %1, viga: %2</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
@@ -2128,22 +2128,22 @@ Selle kasutamine pole soovitatav.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Vali, mida sünkroniseerida</translation>
      </message>
@@ -2166,14 +2166,14 @@ Selle kasutamine pole soovitatav.</translation>
          <translation>Suurus</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>Serveris pole praegu alamkaustasid.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
          <translation type="unfinished"/>
      </message>
  </context>
@@ -2739,6 +2739,11 @@ Selle kasutamine pole soovitatav.</translation>
          <source>Error while reading folder.</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2830,11 +2835,6 @@ Selle kasutamine pole soovitatav.</translation>
          <source>Filename is too long.</source>
          <translation>Faili nimi on liiga pikk.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
@@ -3344,7 +3344,7 @@ Selle kasutamine pole soovitatav.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
          <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>tulevikus</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3354,7 +3354,7 @@ Selle kasutamine pole soovitatav.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
          <source>now</source>
-        <translation type="unfinished"/>
+        <translation>kohe</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="460"/>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts

index f644f5bfd88d8246213ef4d1ba45a19b154e671d..96f8e380ea68d13a6d28396e71b71d2ad191718b 100644 (file)
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Ezeztatu</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Kontua</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Hautatu zer sinkronizatu</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Ezabatu karpeta honen konexioa</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Karpeta sortzeak huts egin du</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
          <translation>&lt;p&gt;Ezin izan da &lt;i&gt;%1&lt;/i&gt; bertako karpeta sortu.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Baieztatu Karpetaren Konexioaren Ezabatzea</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Ezabatu Karpeta Honen Konexioa</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Sinkronizazioa martxan da</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>%1ra konektatuta.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>%1 zerbitzaria ez dago orain eskuragarri</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>%1etik saioa itxita.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Hasi saioa</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Sinkronizatuko ez diren oso handiak diren karpeta berriak daude:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Baieztatu Kontuaren Ezabatzea</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Ezabatu konexioa</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Saioa bukatu</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Berrekin sinkronizazioa</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Gelditu sinkronizazioa</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%2tik %1 erabilita</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Ez dago %1 konexiorik konfiguratuta.</translation>
      </message>
@@ -623,46 +623,46 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Ezabatu Fitxategi Guztiak?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Ezabatu fitxategi guztiak</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Mantendu fitxategiak</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1072,7 +1072,7 @@ Geratzen den denbora %5</translation>
          <translation>Zerbitzariak eduki-hein desegokia itzuli du</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Konexioa denboraz kanpo</translation>
      </message>
@@ -1838,37 +1838,37 @@ Ez da gomendagarria erabltzea.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Fitxategia zerbitzaritik ezabatua izan da</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation type="unfinished"/>
      </message>
@@ -2134,22 +2134,22 @@ Ez da gomendagarria erabltzea.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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>Desmarkatutako karpetak zure bertako fitxategi sistematik &lt;b&gt;ezabatuko&lt;/b&gt; dira eta ez dira gehiago ordenagailu honekin sinkronizatuko</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
          <translation>Hautatu zer nahi duzun sinkronizatzea: Hautatu sinkronizatu nahi dituzun urruneko azpikarpetak.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
          <translation>Hautatu zer nahi duzun sinkronizatzea: Desmarkatu sinkronizatu nahi ez dituzun urruneko azpikarpetak.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Hautatu zer sinkronizatu</translation>
      </message>
@@ -2172,14 +2172,14 @@ Ez da gomendagarria erabltzea.</translation>
          <translation>Tamaina</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>Ez dago azpikarpetarik zerbitzarian.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
          <translation type="unfinished"/>
      </message>
  </context>
@@ -2743,6 +2743,11 @@ Ez da gomendagarria erabltzea.</translation>
          <source>Error while reading folder.</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2834,11 +2839,6 @@ Ez da gomendagarria erabltzea.</translation>
          <source>Filename is too long.</source>
          <translation type="unfinished"/>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts

index 8886210a45afb0afccff3ee5f6ad576b20c56f05..1328d61c38ff01169e341c7c685f27375b05962e 100644 (file)
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>منصرف شدن</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>حساب کاربری</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>انتخاب موارد همگام‌سازی</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>همگام سازی در حال اجراست</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>متصل به %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>سرور %1 بصورت موقت خارج از دسترس است.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>ورود</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation type="unfinished"/>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>خروج</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>از سر‎گیری همگام‌سازی</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>توقف به‌هنگام‌سازی </translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>بدون %1 اتصال پیکربندی شده.</translation>
      </message>
@@ -623,46 +623,46 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>حذف تمام فایل ها؟</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>حذف تمام فایل ها</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>نگه داشتن فایل ها</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1072,7 +1072,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>تایم اوت اتصال</translation>
      </message>
@@ -1831,37 +1831,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>فایل از روی سرور حذف شد</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation type="unfinished"/>
      </message>
@@ -2127,22 +2127,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>انتخاب موارد همگام‌سازی</translation>
      </message>
@@ -2165,14 +2165,14 @@ It is not advisable to use it.</source>
          <translation>اندازه</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
          <translation type="unfinished"/>
      </message>
  </context>
@@ -2736,6 +2736,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation>خطا در هنگام خواندن پوشه</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2827,11 +2832,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>نام فایل خیلی طولانی است.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts

index 668624bb1028065f526b3b7321cd2eca18a37045..7f6e1e730300aa1ceb3e6f881867ec4162f4592d 100644 (file)
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Peruuta</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Tili</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Valitse synkronoitavat tiedot</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Poista kansion synkronointiyhteys</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Kansion luominen epäonnistui</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Vahvista kansion synkronointiyhteyden poisto</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Poista kansion synkronointiyhteys</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Synkronointi meneillään</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 käytössä</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
          <translation>%1 käyttäjänä &lt;i&gt;%2&lt;/i&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Yhteys muodostettu kohteeseen %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <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="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Kirjauduttu ulos kohteesta %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <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="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Kirjaudu sisään</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Havaittiin uusia kansioita, joita ei synkronoitu niiden suuren koon vuoksi:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Vahvista tilin poistaminen</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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;Haluatko varmasti poistaa tilin &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Huomio:&lt;/b&gt; Tämä toimenpide &lt;b&gt;ei&lt;/b&gt; poista mitään tiedostoja.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Poista yhteys</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Kirjaudu ulos</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Palauta synkronointi</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Keskeytä synkronointi</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;Haluatko varmasti lopettaa kansion &lt;i&gt;%1&lt;/i&gt; synkronoinnin?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Huomio:&lt;/b&gt; Tämä toimenpide &lt;b&gt;ei&lt;/b&gt; poista mitään tiedostoja.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1/%2 (%3 %) käytössä. Jotkin kansiot, mukaan lukien verkkojaot ja jaetut kansiot, voivat sisältää eri rajoitukset.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1/%2 käytössä</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>%1-yhteyttä ei ole määritelty.</translation>
      </message>
@@ -624,46 +624,46 @@ Please go in the settings to select it if you wish to download it.</source>
  Siirry asetuksiin valitaksesi sen, jos haluat ladata kyseisen kansion.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Poistetaanko kaikki tiedostot?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Poista kaikki tiedostot</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Säilytä tiedostot</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>Varmuuskopio poistettu</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>Normaali synkronointi</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1073,7 +1073,7 @@ Aikaa jäljellä yhteensä %5</translation>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Yhteys aikakatkaistiin</translation>
      </message>
@@ -1839,37 +1839,37 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>Lataaminen laskisi vapaan levytilan määrän alle rajan %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Levyllä on vapaata tilaa vähemmän kuin %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Tiedosto poistettiin palvelimelta</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Tiedostoa ei voitu ladata täysin.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Tiedosto on muuttunut löytymisen jälkeen</translation>
      </message>
@@ -2135,22 +2135,22 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Valitse synkronoitavat tiedot</translation>
      </message>
@@ -2173,15 +2173,15 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
          <translation>Koko</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Virhe alihakemistolistausta ladattaessa.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2746,6 +2746,11 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
          <source>Error while reading folder.</source>
          <translation>Kansiota lukiessa tapahtui virhe</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2837,11 +2842,6 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
          <source>Filename is too long.</source>
          <translation>Tiedoston nimi on liian pitkä.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Tiedosto ohitetaan, koska se on piilotettu.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts

index 57f61218f3f1d60c021d8e7eb96921afa975192a..803a5dbf264214719dcddaa9424f38ef20ea9c22 100644 (file)
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Annuler</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Compte</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Choisir le contenu à synchroniser</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Supprimer la synchronisation du dossier</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Échec de création du dossier</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Confirmer une suppression de synchronisation de dossier</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Supprimer la synchronisation de ce dossier</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Synchronisation en cours</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 utilisés</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Connecté à %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Le serveur %1 est temporairement indisponible.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Session sur %1 fermée.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <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="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Se connecter</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Certains dossiers n&apos;ont pas été synchronisés en raison de leur taille trop importante :</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Confirmer la suppression du compte</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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 enlever le compte &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; Aucun fichier ne sera supprimé&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Supprimer la connexion</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Se déconnecter</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Reprendre</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Mettre en pause</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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 fichier ne sera supprimé.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) de %2 utilisés. Certains dossiers, montés depuis le réseau ou partagés, peuvent avoir des limites différentes.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 sur %2 utilisés</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Aucune connexion à %1 configurée</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Veuillez le sélectionner dans la fenêtre des paramètres pour le télécharger.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,22 +633,22 @@ Peut-être la configuration a-t-elle été modifiée, ou les fichiers  supprimé
  Êtes-vous sûr de vouloir effectuer cette opération ?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Supprimer tous les fichiers ?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Supprimer tous les fichiers</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Garder les fichiers</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -657,17 +657,17 @@ Cela peut être dû à une copie de sauvegarde restaurée sur le serveur.
  Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fichiers soient remplacés par des fichiers plus vieux d&apos;un état précédent. Voulez-vous garder les versions les plus récentes de vos fichiers en tant que fichiers conflictuels ?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>Sauvegarde détecté</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>Synchronisation normale</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation>Garder les fichiers locaux comme Conflits</translation>
      </message>
@@ -1077,7 +1077,7 @@ Temps restant total %5</translation>
          <translation>Le serveur a retourné une gamme de contenu erronée</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Délai d&apos;attente de connexion dépassé</translation>
      </message>
@@ -1844,37 +1844,37 @@ Il est déconseillé de l&apos;utiliser.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Le fichier %1 ne peut pas être téléchargé en raison d&apos;un conflit sur le nom de fichier local. </translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>Le téléchargement réduirait l&apos;espace libre à moins de %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Il y a moins de %1 d&apos;espace libre sur le disque</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Le fichier a été supprimé du serveur</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Le fichier n&apos;a pas pu être téléchargé intégralement.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Le fichier %1 n&apos;a pas pu être sauvegardé en raison d&apos;un conflit sur le nom du fichier local !</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Le fichier a changé depuis sa découverte</translation>
      </message>
@@ -2146,22 +2146,22 @@ Il est déconseillé de l&apos;utiliser.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Choisir le contenu à synchroniser</translation>
      </message>
@@ -2184,15 +2184,15 @@ Il est déconseillé de l&apos;utiliser.</translation>
          <translation>Taille</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Une erreur est survenue lors du chargement de la liste des sous-dossiers.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2757,6 +2757,11 @@ Il est déconseillé de l&apos;utiliser.</translation>
          <source>Error while reading folder.</source>
          <translation>Erreur lors de la lecture du dossier.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2848,11 +2853,6 @@ Il est déconseillé de l&apos;utiliser.</translation>
          <source>Filename is too long.</source>
          <translation>Le nom de fichier est trop long.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Le fichier est ignoré car il est caché.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
@@ -3362,7 +3362,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
          <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>Dans le futur</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3372,7 +3372,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
          <source>now</source>
-        <translation type="unfinished"/>
+        <translation>maintenant</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="460"/>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts

index 1c465ace2283b7fcb301aa44f97d00a4d8040e80..f95752238dba7ec91d812e24936ebefd01c7ff6d 100644 (file)
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Cancelar</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Conta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Escolla que sincronizar</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Non foi posíbel crear o cartafol</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Sincronización en proceso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Conectado a %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <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="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Desconectado de %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <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="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Acceder</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation type="unfinished"/>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Desconectar</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Continuar coa sincronización</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Por en pausa a sincronización</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Non se configurou a conexión %1.</translation>
      </message>
@@ -624,46 +624,46 @@ Please go in the settings to select it if you wish to download it.</source>
  Vaia aos axustes e seleccióneo se quere descargalo.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Retirar todos os ficheiros?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Retirar todos os ficheiros</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Manter os ficheiros</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1073,7 +1073,7 @@ Tempo total restante %5</translation>
          <translation>O servidor devolveu un intervalo de contidos estragado</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Esgotouse o tempo de conexión</translation>
      </message>
@@ -1838,37 +1838,37 @@ Recomendámoslle que non o use.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Non é posíbel descargar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>O ficheiro vai seren eliminado do servidor</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Non foi posíbel descargar completamente o ficheiro.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Non foi posíbel gardar o ficheiro %1 por mor dunha colisión co nome dun ficheiro local!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>O ficheiro cambiou após seren atopado</translation>
      </message>
@@ -2137,22 +2137,22 @@ Recomendámoslle que non o use.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Escolla que sincronizar</translation>
      </message>
@@ -2175,15 +2175,15 @@ Recomendámoslle que non o use.</translation>
          <translation>Tamaño</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Produciuse un erro mentres se cargaba a lista de subcartafoles.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2748,6 +2748,11 @@ Recomendámoslle que non o use.</translation>
          <source>Error while reading folder.</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2839,11 +2844,6 @@ Recomendámoslle que non o use.</translation>
          <source>Filename is too long.</source>
          <translation>O nome de ficheiro é longo de máis.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>O ficheiro foi ignorado por estaren agochado.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts

index b6a4ff9671f5bd4c759b00d6b866cc0b6597b010..17c8915488ff28862a7af56688e5bacfabe9ba7b 100644 (file)
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Mégsem</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Fiók</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Szinkronizálandó elemek kiválasztása</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Könyvtár létrehozása nem sikerült</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
          <translation>&lt;p&gt;Nem lehet helyi könyvtárat létrehozni: &lt;i&gt;%1&lt;/i&gt;.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Szinkronizálás fut</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
          <translation>%1, mint &lt;i&gt;%2&lt;/i&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Csatlakozva: %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>%1 szerver jelenleg nem elérhető.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Kijelentkezve innen: %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>Nincs kapcsolat ehhez: %1 ekkor: %2.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Bejelentkezés</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Fiók törlésének megerősítése</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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;Tényleg törölni szeretnéd a kapcsolatot &lt;i&gt;%1&lt;/i&gt; fiókkal?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Megjegyzés:&lt;/b&gt; Ez &lt;b&gt;nem&lt;/b&gt; töröl fájlokat.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Kapcsolat törlése</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Kilépés</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Szinkronizálás folytatása</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Szinkronizálás szüneteltetése</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;Tényleg leszeretnéd állítani &lt;i&gt;%1&lt;/i&gt; könyvtár szinkronizálását?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Megjegyzés:&lt;/b&gt; Ez &lt;b&gt;nem&lt;/b&gt; töröl fájlokat.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) / %2 használatban. Néhány könyvtár - beleértve a hálózati megosztásokat és a megosztott könyvtárakat - eltérő korlátozással rendelkezhet.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 / %2 használatban</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation>Jelenleg nem érhető el tárhelyhasználati információ.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Nincs beállított kapcsolat: %1.</translation>
      </message>
@@ -623,46 +623,46 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>El legyen távolítva az összes fájl?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Összes fájl eltávolítása</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Fájlok megtartása</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1072,7 +1072,7 @@ Hátralévő idő: %5</translation>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Kapcsolat időtúllépés</translation>
      </message>
@@ -1835,37 +1835,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>A fájl törlésre került a szerverről</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation type="unfinished"/>
      </message>
@@ -2131,22 +2131,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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>A jelöletlen könyvtárak &lt;b&gt;törlésre kerülnek&lt;/b&gt; a helyi fájlrendszeredről és a továbbiakban nem lesz szinkronizálva ezzel a számítógéppel</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Szinkronizálandó elemek kiválasztása</translation>
      </message>
@@ -2169,14 +2169,14 @@ It is not advisable to use it.</source>
          <translation>Méret</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
          <translation type="unfinished"/>
      </message>
  </context>
@@ -2741,6 +2741,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2832,11 +2837,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>Fájlnév túl nagy.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Fájl kihagyva, mert rejtett.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_it.ts b/translations/client_it.ts

index 5de0fd4073d5a560292565f8aaf212185b3d4e78..d063da588aef3e9795c3e5a7d2344e15e2b7b4e5 100644 (file)
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Annulla</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Account</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Scegli cosa sincronizzare</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Rimuovi connessione di sincronizzazione cartelle</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Creazione della cartella non riuscita</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Conferma rimozione connessione di sincronizzazione cartelle</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Rimuovi connessione di sincronizzazione cartelle</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>La sincronizzazione è in corso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 in uso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Connesso a %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Il server %1 è temporaneamente non disponibile.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Disconnesso da %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <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="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Accedi</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Conferma rimozione account</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Rimuovi connessione</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Esci</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Riprendi la sincronizzazione</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Sospendi la sincronizzazione</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) di %2 in uso. Alcune cartelle, incluse quelle montate in rete o le cartelle condivise, potrebbero avere limiti diversi.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1% di %2 in uso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Nessuna connessione di %1 configurata.</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Vai nelle impostazioni per selezionarla se desideri scaricarla.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,22 +633,22 @@ Ciò potrebbe accadere in caso di riconfigurazione della cartella o di rimozione
  Sei sicuro di voler eseguire questa operazione?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Vuoi rimuovere tutti i file?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Rimuovi tutti i file</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Mantieni i file</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -657,17 +657,17 @@ Ciò potrebbe verificarsi in seguito al ripristino di un backup sul server.
  Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tutti i tuoi file con file più datati in uno stato precedente. Vuoi mantenere i tuoi file locali più recenti come file di conflitto?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>Backup rilevato</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>Sincronizzazione normale</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation>Mantieni i file locali come conflitto</translation>
      </message>
@@ -1077,7 +1077,7 @@ Totale tempo rimanente %5</translation>
          <translation>Il server ha restituito un content-range errato</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Connessione scaduta</translation>
      </message>
@@ -1843,37 +1843,37 @@ Non è consigliabile utilizzarlo.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Il file %1 non può essere scaricato a causa di un conflitto con un file locale.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>Lo scaricamento ridurrà lo spazio libero su disco al di sotto di %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Lo spazio libero su disco è inferiore a %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Il file è stato eliminato dal server</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Il file non può essere scaricato completamente.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Il file %1 non può essere salvato a causa di un conflitto con un file locale.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Il file è stato modificato dal suo rilevamento</translation>
      </message>
@@ -2143,22 +2143,22 @@ Non è consigliabile utilizzarlo.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Scegli cosa sincronizzare</translation>
      </message>
@@ -2181,15 +2181,15 @@ Non è consigliabile utilizzarlo.</translation>
          <translation>Dimensione</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <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>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2754,6 +2754,11 @@ Non è consigliabile utilizzarlo.</translation>
          <source>Error while reading folder.</source>
          <translation>Errore durante la lettura della cartella.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2845,11 +2850,6 @@ Non è consigliabile utilizzarlo.</translation>
          <source>Filename is too long.</source>
          <translation>Il nome del file è troppo lungo.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Il file è ignorato poiché è nascosto.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts

index 874a42bf8345aa4a9ed957ab6c8d5f3bdfa4bb4a..d974b8823e0e678d72522ae19e96d23a56f39307 100644 (file)
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>キャンセル</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>アカウント</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>同期フォルダーを選択</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>同期フォルダー接続を削除</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>フォルダーの作成に失敗しました</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>同期フォルダー接続の削除を確認</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>同期フォルダー接続を削除</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>同期を実行中</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 を使用中</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>%1 に接続</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>サーバー %1 は一時的に利用できません</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>%1 からサインアウトしました。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>%2 の %1 への接続がありません。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>ログイン</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>容量が大きいため、同期されていない新規フォルダーがあります:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>アカウント削除確認</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>接続削除</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>ログアウト</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>再開</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>一時停止</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%2 の %1(%3%) 利用中。外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%2 のうち %1 を使用中</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation>現在、利用できるストレージ利用状況はありません。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>%1 の接続は設定されていません。</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  ダウンロードしたい場合は、設定画面で選択してください。</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,41 +633,43 @@ Are you sure you want to perform this operation?</source>
  本当にこの操作を実行しますか？</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>すべてのファイルを削除しますか？</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>すべてのファイルを削除</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>ファイルを残す</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
-        <translation type="unfinished"/>
+        <translation>この同期のタイミングで同期フォルダー &apos;%1&apos; のファイルが古いファイルに戻る可能性があります。
+これはサーバーのファイルがバックアップとして復旧されるかもしれないからです。
+このまま同期を続けた場合、あたらしいファイルが全て古いファイルで上書きされます。ローカルファイルで新しいものをコンフリクトファイルとして保持しますか？</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>バックアップが検出されました</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>正常同期</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
-        <translation type="unfinished"/>
+        <translation>コンフリクト時にローカルファイルを保持</translation>
      </message>
  </context>
  <context>
@@ -1075,7 +1077,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation>サーバーが間違ったcontent-rangeを返しました</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>接続タイムアウト</translation>
      </message>
@@ -1840,37 +1842,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>ファイル %1 はローカルファイル名が衝突しているためダウンロードできません！</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>ダウンロードすると、空き容量が %1  になります</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>ディスク空き容量が %1 よりも少なくなっています</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>ファイルはサーバーから削除されました</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>このファイルのダウンロードは完了しませんでした</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>%1 はローカルファイル名が衝突しているため保存できません！</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>ファイルは発見以降に変更されました</translation>
      </message>
@@ -2138,22 +2140,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
          <translation>同期対象の選択: 同期したいリモートのサブフォルダーを選択してください。</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>同期フォルダーを選択</translation>
      </message>
@@ -2176,15 +2178,15 @@ It is not advisable to use it.</source>
          <translation>サイズ</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>現在サーバーにサブフォルダーはありません。</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>サーバーからフォルダーのリスト取得時にエラーが発生しました。</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2749,6 +2751,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation>フォルダーの読み込みエラー</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2840,11 +2847,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>ファイル名が長すぎます</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>隠しファイルのため無視されました</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
@@ -3354,7 +3356,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
          <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>今後</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3364,7 +3366,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
          <source>now</source>
-        <translation type="unfinished"/>
+        <translation>今</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="460"/>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts

index 071f7d330075ac28db960abccbaf378aa020e3a5..77a315e4835510f2c2b919027745e7b97d95328b 100644 (file)
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Avbryt</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Konto</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Velg hva som synkroniseres</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Fjern tilkobling for mappe-synkronisering</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Oppretting av mappe feilet</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
          <translation>&lt;p&gt;Klarte ikke å opprette lokal mappe &lt;i&gt;%1&lt;/i&gt;.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Bekreft fjerning av tilkobling for mappe-synkronisering</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Fjern tilkobling for mappe-synkronisering</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Synkroniserer...</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 i bruk</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
          <translation>%1 som &lt;i&gt;%2&lt;/i&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Tilkoblet %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Server %1 er midlertidig utilgjengelig.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Logget ut fra %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>Ingen tilkobling til %1 på %2.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Logg inn</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Det finnes nye mapper som ikke ble synkronisert fordi de er for store: </translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Bekreft fjerning av konto</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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;Vil du virkelig fjerne tilkoblingen til kontoen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Merk:&lt;/b&gt; Dette vil &lt;b&gt;ikke&lt;/b&gt; slette noen filer.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Fjern tilkobling</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Logg ut</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Fortsett synkronisering</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Sett synkronisering på pause</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;Vil du virkelig stoppe synkronisering av mappen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Merk:&lt;/b&gt; Dette vil &lt;b&gt;ikke&lt;/b&gt; slette noen filer.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) av %2 i bruk. Noen mapper, inkludert nettverkstilkoblede eller delte mapper, kan ha andre begrensninger.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 av %2 i bruk</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Ingen %1-forbindelse konfigurert.</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Gå til Innstillinger og velg mappen hvis du ønsker å laste den ned.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,22 +633,22 @@ Dette kan være fordi mappen ble omkonfigurert i det stille, eller alle filene b
  Er du sikker på at du vil utføre denne operasjonen?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Fjerne alle filer?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Fjern alle filer</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Behold filer</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -657,17 +657,17 @@ Dette kan være fordi en backup ble gjenopprettet på serveren.
  Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrevet av en eldre fil i en tidligere tilstand. Ønsker du å beholde dine ferskeste lokale filer som konflikt-filer?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>Backup oppdaget</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>Normal synkronisering</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation>Behold lokale filer som konflikt</translation>
      </message>
@@ -1077,7 +1077,7 @@ Tid som gjenstår %5</translation>
          <translation>Serveren returnerte feil content-range</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Tidsavbrudd ved tilkobling</translation>
      </message>
@@ -1844,37 +1844,37 @@ Det er ikke tilrådelig å bruke den.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Fil %1 kan ikke lastes ned på grunn av lokalt sammenfall av filnavn!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>Nedlastingen ville ha redusert ledig diskplass til under %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Ledig plass på disk er mindre enn %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Filen ble slettet fra serveren</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Hele filen kunne ikke lastes ned.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Fil %1 kan ikke lagres på grunn av lokal konflikt med filnavn.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Filen er endret siden den ble oppdaget</translation>
      </message>
@@ -2144,22 +2144,22 @@ Det er ikke tilrådelig å bruke den.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Velg hva som synkroniseres</translation>
      </message>
@@ -2182,15 +2182,15 @@ Det er ikke tilrådelig å bruke den.</translation>
          <translation>Størrelse</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>Ingen undermapper på serveren nå</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Det oppstod en feil ved lasting av liste av undermapper.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2755,6 +2755,11 @@ Det er ikke tilrådelig å bruke den.</translation>
          <source>Error while reading folder.</source>
          <translation>Feil ved lesing av mappe.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2846,11 +2851,6 @@ Det er ikke tilrådelig å bruke den.</translation>
          <source>Filename is too long.</source>
          <translation>Filnavn er for langt.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Filen ignoreres fordi den er skjult.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
@@ -3360,7 +3360,7 @@ Det er ikke tilrådelig å bruke den.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
          <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>fram i tid</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3370,7 +3370,7 @@ Det er ikke tilrådelig å bruke den.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
          <source>now</source>
-        <translation type="unfinished"/>
+        <translation>nå</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="460"/>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts

index ab39d6f6e7a294025f71e3967e96c75e05ebe41d..d9409219a4be2b6f47a630110fc6db082789f459 100644 (file)
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Annuleren</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Account</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Selectieve synchronisatie</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Verwijderen map sync verbinding</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Maken map mislukt</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Bevestig verwijderen Map Sync verbinding</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Verwijderen Map Sync verbinding</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Bezig met synchroniseren</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 in gebruik</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Verbonden met %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Server %1 is tijdelijk niet beschikbaar</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Uitgelogd van %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <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="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Meld u aan</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Er zijn nieuwe mappen die niet gesynchroniseerd werden omdat ze te groot zijn:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Bevestig verwijderen account</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Verwijderen verbinding</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Afmelden</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Hervatten sync</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Pauzeren sync</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) van %2 in gebruik. Sommige mappen, inclusief netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 van %2 in gebruik</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Geen %1 connectie geconfigureerd.</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,41 +633,43 @@ Dat zou kunnen gebeuren omdat de map stilletjes was geherconfigureerd, of omdat
  Weet je zeker dat je door wilt gaan?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Verwijder alle bestanden?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Verwijder alle bestanden</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Bewaar bestanden</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
-        <translation type="unfinished"/>
+        <translation>Deze synchronisatie zou uw bestanden terug zetten naar een eerdere staat van de synchronisatie map &apos;%1&apos;.
+Dit kan komen doordat een backup is hersteld op de server.
+Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere versie. Wilt u uw lokale meer recentere bestanden behouden als conflict bestanden?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>Backup gedetecteerd</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>Normale synchronisatie</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Behoud lokale bestanden als conflict</translation>
      </message>
  </context>
  <context>
@@ -1076,7 +1078,7 @@ Totaal resterende tijd %5</translation>
          <translation>Server retourneerde verkeerde content-bandbreedte</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Verbindingstime-out</translation>
      </message>
@@ -1843,37 +1845,37 @@ We adviseren deze site niet te gebruiken.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Bestand %1 kan niet worden gedownload omdat de naam conflicteert met een lokaal bestand</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>De download zou de vrije schijfruimte beperken tot onder %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Vrije schijfruimte is minder dan %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Bestand was verwijderd van de server</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Het bestand kon niet volledig worden gedownload.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Bestand %1 kan niet worden opgeslagen wegens een lokaal bestandsnaam conflict!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Het bestand is gewijzigd sinds het is gevonden</translation>
      </message>
@@ -2143,22 +2145,22 @@ We adviseren deze site niet te gebruiken.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Wat synchroniseren</translation>
      </message>
@@ -2181,15 +2183,15 @@ We adviseren deze site niet te gebruiken.</translation>
          <translation>Grootte</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Er trad een fout op bij het laden van de lijst met submappen.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2754,6 +2756,11 @@ We adviseren deze site niet te gebruiken.</translation>
          <source>Error while reading folder.</source>
          <translation>Fout tijdens lezen map.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2845,11 +2852,6 @@ We adviseren deze site niet te gebruiken.</translation>
          <source>Filename is too long.</source>
          <translation>De bestandsnaam is te lang.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Bestand is genegeerd omdat het verborgen is.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
@@ -3359,7 +3361,7 @@ We adviseren deze site niet te gebruiken.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
          <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>in de toekomst</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3369,7 +3371,7 @@ We adviseren deze site niet te gebruiken.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
          <source>now</source>
-        <translation type="unfinished"/>
+        <translation>nu</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="460"/>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts

index 09673bc455a622a65318693916133ba70db56ef9..165dea624b66532bec73f4b024dfca754278d0b8 100644 (file)
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Anuluj</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Konto</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Wybierz co synchronizować</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Nie udało się stworzyć katalogu</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
          <translation>&lt;p&gt;Nie można stworzyć lokalnego katalogu &lt;i&gt;%1&lt;/i&gt;.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Synchronizacja uruchomiona</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Podłączony do %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Serwer %1 jest tymczasowo niedostępny.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>Brak połączenia do %1 z %2.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Zaloguj</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Usuwanie połączenia</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Wyloguj</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Przywróć synchronizację</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Zatrzymaj synchronizację</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Połączenie %1 nie skonfigurowane.</translation>
      </message>
@@ -623,46 +623,46 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Usunąć wszystkie pliki?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Usuń wszystkie pliki</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Pozostaw pliki</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1072,7 +1072,7 @@ Pozostało czasu %5</translation>
          <translation>Serwer zwrócił błędną zakres zawartości</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Limit czasu połączenia</translation>
      </message>
@@ -1833,37 +1833,37 @@ Niezalecane jest jego użycie.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Nie można pobrać pliku %1 ze względu na konflikt nazwy pliku lokalnego!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation type="unfinished"/>
      </message>
@@ -2129,22 +2129,22 @@ Niezalecane jest jego użycie.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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>Niezaznaczone katalogi zostaną &lt;b&gt;usunięte&lt;/b&gt; z lokalnego systemu plików i nie będą już więcej synchronizowane na tym komputerze.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Wybierz co synchronizować</translation>
      </message>
@@ -2167,14 +2167,14 @@ Niezalecane jest jego użycie.</translation>
          <translation>Rozmiar</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
          <translation type="unfinished"/>
      </message>
  </context>
@@ -2740,6 +2740,11 @@ Niezalecane jest jego użycie.</translation>
          <source>Error while reading folder.</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2831,11 +2836,6 @@ Niezalecane jest jego użycie.</translation>
          <source>Filename is too long.</source>
          <translation>Nazwa pliku zbyt długa</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts

index 17ef0fcfa2534a7456d1083d42bc927ce583ed5f..a4f6b3446410fcacd82a93de096b5ba1c27b1671 100644 (file)
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Cancelar</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Conta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Escolher o que sincronizar</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Remover a conexão ao directório de sincronização</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Falhou a criação da pasta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Confirme a eliminação da conexão ao Directório de sincronização</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Remover a conexão ao Directório de sincronização.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Sincronização em Execução</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 em utilização</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Conectado a %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <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="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Terminou a sessão de %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <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="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Iniciar Sessão</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Existem novos directórios que não foram sincronizados porque são demasiado grandes:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Confirmar Remoção da Conta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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;Deseja mesmo remover a ligação a esta 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; apaga quaisquer ficheiros.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Remover ligação</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Terminar sessão</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Retomar sincronização</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Pausar sincronização</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;Deseja mesmo parar a sincronização da 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; apaga quaisquer ficheiros.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) de %2 em uso. Algumas pastas, incluindo pastas de rede ou partilhadas, podem ter limites diferentes.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 de %2 em uso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>%1 sem ligação configurada.</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Por favor, vá às definições para a selecionar, se a desejar transferir.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,22 +633,22 @@ Isto poderá acontecer porque a pasta foi reconfigurada silenciosamente, ou todo
  Tem a certeza que deseja realizar esta operação?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Remover todos os ficheiros?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Remover todos os ficheiros</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Manter os ficheiros</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -657,17 +657,17 @@ Isto pode ser porque um backup foi restaurado no servidor.
  Continuando a sincronização fará com que todos os seus ficheiros sejam substituídos por um ficheiro mais velho num estado anterior. Deseja manter os seus ficheiros locais mais recentes como ficheiros de conflito?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>Cópia de segurança encontrada</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>Sincronização Normal</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation>Manter Ficheiros Locais como Conflito</translation>
      </message>
@@ -1077,7 +1077,7 @@ Tempo total restante %5</translation>
          <translation>O servidor retornou o alcance-conteúdo errado</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>O tempo de ligação expirou</translation>
      </message>
@@ -1843,37 +1843,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>O ficheiro %1 não pode ser descarregado devido a conflito com um nome de ficheiro local!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>O download pode reduzir o espaço livre em disco para abaixo de %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>O Espaço livre no disco é inferior a %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>O ficheiro foi eliminado do servidor</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Não foi possível transferir o ficheiro na totalidade.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Ficheiro %1 não pode ser guardado devido à existência de um ficheiro local com o mesmo nome.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>O ficheiro alterou-se desde a sua descoberta</translation>
      </message>
@@ -2143,22 +2143,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Escolher o Que Sincronizar</translation>
      </message>
@@ -2181,15 +2181,15 @@ It is not advisable to use it.</source>
          <translation>Tamanho</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Ocorreu um erro ao carregar a lista de sub-pastas.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2754,6 +2754,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation>Erro ao ler o ficheiro.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2845,11 +2850,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>O nome do ficheiro é muito grande</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>O ficheiro é ignorado porque está ocultado.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts

index 9dc5fff33177205c045aa3f9626ee52874473d7f..52541e6023fae554825ad69006390b123132348f 100644 (file)
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Cancelar</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Conta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Escolha o que quer sincronizar</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Remover a conexão de sincronização de pastas</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Falha na criação de pasta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Confirme a Remoção de Sincronização de Pasta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Remover a Conexão de Sincronização de pasta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Sincronização Acontecendo</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 em uso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Conectado a %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <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="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Assibndado por %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <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="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Entrar</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Há novas pastas que não foram sincronizadas, porque eles são muito grandes:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Confirmar a Remoção da Conta</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Remover conexão</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Sair</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Resumir sincronização</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Pausar sincronização</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) de%2 em uso. Algumas pastas, incluindo montadas na rede ou pastas compartilhadas, podem ter limites diferenes.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 de %2 em uso</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Nenhuma %1 conexão configurada.</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Por favor, vá nas configurações para selecionar o que você deseja para fazer o download.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,22 +633,22 @@ Isso pode ser porque a pasta foi reconfigurada em silêncio, ou porque todos os
  Tem certeza de que deseja executar esta operação?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Deseja Remover Todos os Arquivos?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Remover todos os arquivos</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Manter arquivos</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -657,17 +657,17 @@ Isso pode ser porque um backup foi restaurado no servidor.
  Continuando a sincronização como normal fará com que todos os seus arquivos sejam substituídos por um arquivo mais velho em um estado anterior. Você deseja manter seus locais de arquivos mais recentes como arquivos de conflito?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>Backup detectado</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>Sincronização Normal</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation>Manter Arquivos Locais como Conflito</translation>
      </message>
@@ -1077,7 +1077,7 @@ Total de tempo que falta %5</translation>
          <translation>O servidor retornou erro numa série-de-conteúdo</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Conexão Finalizada</translation>
      </message>
@@ -1844,37 +1844,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>O arquivo %1 não pode ser baixado por causa de um confronto local no nome do arquivo!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>O download reduziá o espaço livre em disco abaixo de %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>O espaço livre no disco é inferior a 1%</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>O arquivo foi eliminado do servidor</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>O arquivo não pode ser baixado completamente.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>O arquivo %1 não pode ser salvo por causa de um confronto com um nome de arquivo local!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Arquivo foi alterado desde a descoberta</translation>
      </message>
@@ -2143,22 +2143,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Escolher o que Sincronizar</translation>
      </message>
@@ -2181,15 +2181,15 @@ It is not advisable to use it.</source>
          <translation>Tamanho</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Ocorreu um erro ao carregar a lista de sub-pastas.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2754,6 +2754,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation>Erro ao ler pasta.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2845,11 +2850,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>O nome do arquivo é muito longo.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Arquivo foi ignorado porque está escondido.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts

index 176fa39bac24bc504a3ce08591d484e0ad4a53d9..8882d74ee44deeae6a137e0a4da225902664b580 100644 (file)
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Отмена</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Уч.запись</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Уточнить объекты</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Удалить подключение синхронизации каталога</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Ошибка создания каталога</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Подтвердите удаление подключения синхронизации каталога</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Удалить подключение синхронизации каталога</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Синхронизация запущена</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 используется</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Соединен с %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Сервер %1 временно недоступен.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Успешно вышли из %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>Нет соединения с %1 в %2.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Войти</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Есть новые каталоги, которые не были синхронизированы, так как они слишком большие:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Подтверждение удаления учетной записи</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Удалить подключение</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Выйти</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Продолжить синхронизацию</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Приостановить синхронизацию</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) из %2 используется. Некоторые папки, включая сетевые или общие, могут иметь разные ограничения.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 из %2 используется</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation>В данный момент информация о заполненности хранилища недоступна.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Нет настроенного подключения %1.</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Пожалуйста, перейдите в настройки, если хотите скачать его.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,22 +633,22 @@ Are you sure you want to perform this operation?</source>
  Вы действительно хотите выполнить эту операцию?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Удалить все файлы?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Удалить все файлы</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Сохранить файлы</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -657,17 +657,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
  Продолжение синхронизации в обычном режиме приведет к тому, что все ваши файлы будут перезаписаны старыми файлами в новом состоянии. Вы желаете оставить ваши локальные файлы как конфликтующие?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>Обнаружена резервная копия</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>Обычная синхронизация</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation>Сохранить локальные файлы как конфликтующие</translation>
      </message>
@@ -1077,7 +1077,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation>Сервер вернул неверный диапазон содержимого</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Время ожидания подключения истекло</translation>
      </message>
@@ -1843,37 +1843,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Файл %1 не может быть загружен из-за локального конфликта имен!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>Эта загрузка уменьшит свободное дисковое пространство ниже %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Свободное место на диске меньше, чем %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Файл был удален с сервера</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Невозможно полностью загрузить файл.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Файл %1 не может быть сохранён из-за локального конфликта имен!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>После обнаружения файл был изменен</translation>
      </message>
@@ -2147,22 +2147,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
          <translation>Выберите Что Синхронизировать: Выберите папки на удалённом сервер, которые Вы хотели бы синхронизировать.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Уточнить объекты</translation>
      </message>
@@ -2185,15 +2185,15 @@ It is not advisable to use it.</source>
          <translation>Размер</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>Нет подкаталогов на сервере на данный момент.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Возникла ошибка при загрузке списка подкаталогов.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2758,6 +2758,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation>Произошла ошибка во время чтения папки.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2849,11 +2854,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>Имя файла слишком длинное.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Файл проигнорирован, потому что он скрытый.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
@@ -3363,7 +3363,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
          <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>в будущем</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
@@ -3373,7 +3373,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
          <source>now</source>
-        <translation type="unfinished"/>
+        <translation>сейчас</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="460"/>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts

index 8d7bc4a01ee4413a728ff41de59277316d0e4342..d548292594655c080f1001d2394e5b7d8c2aba68 100644 (file)
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -73,7 +73,7 @@
      <message>
          <location filename="../src/gui/accountsettings.ui" line="55"/>
          <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="76"/>
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Zrušiť</translation>
      </message>
@@ -110,7 +110,7 @@
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="137"/>
          <source>Add new</source>
-        <translation type="unfinished"/>
+        <translation>Pridať nový účet</translation>
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="145"/>
@@ -123,97 +123,97 @@
          <translation>Účet</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Vybrať čo synchronizovať</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
-        <translation type="unfinished"/>
+        <translation>Odstrániť prepojenie priečinka</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Vytvorenie priečinka zlyhalo</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
          <translation>&lt;p&gt;Nemožno vytvoriť lokálny priečinok &lt;i&gt;%1&lt;/i&gt;.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
-        <translation type="unfinished"/>
+        <translation>Potvrdiť odstránenie prepojenia priečinka</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
-        <translation type="unfinished"/>
+        <translation>Odstrániť prepojenie priečinka</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Prebiehajúca synchronizácia</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
          <translation>%1 ako &lt;i&gt;%2&lt;/i&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Pripojené k %1</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Server %1 je dočasne nedostupný.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Odhlásený z %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>Žiadne pripojenie k %1 na %2.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Prihlásiť sa</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
-        <translation type="unfinished"/>
+        <translation>Niektoré nové priečinky neboli synchronizované, pretože sú priveľké:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Potvrďte ostránenie účtu</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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;Naozaj chcete odstrániť pripojenie k účtu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Tým sa &lt;b&gt;nevymažú&lt;/b&gt; žiadne súbory.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Vymazať pripojenie</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Odhlásiť</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Obnoviť synchronizáciu</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Pozastaviť synchronizáciu</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;Naozaj si prajete zastaviť synchronizácu priečinka &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;nevymaže&lt;/b&gt; žiadne súbory.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) z %2 je využitých. Niektoré priečinky, vrátane sieťových a zdieľaných, môžu mať iné limity.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 z %2 je využitých</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Žiadne nakonfigurované  %1 spojenie</translation>
      </message>
@@ -345,7 +345,7 @@
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="430"/>
          <source>Not Synced</source>
-        <translation type="unfinished"/>
+        <translation>Nezosynchronizované</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="451"/>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Pokiaľ si ho prajete stiahnuť, vyberte ho v nastaveniach.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,39 +633,39 @@ Dôvodom môže byť, že sa daný priečinok potichu rekonfiguroval, alebo boli
  Ste si istý, že chcete pokračovať?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Odstrániť všetky súbory?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Odstrániť všetky súbory</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Ponechať súbory</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>Záloha je dostupná</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>Bežná synchronizácia</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1075,7 +1075,7 @@ Celkom zostáva %5</translation>
          <translation>Server vrátil nesprávnu hodnotu Content-range</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Spojenie vypršalo</translation>
      </message>
@@ -1836,37 +1836,37 @@ Nie je vhodné ju používať.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Súbor %1 nie je možné stiahnuť, pretože súbor s rovnakým menom už existuje!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Súbor sa nedá stiahnuť úplne.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Súbor %1 nie je možné uložiť, pretože jeho názov koliduje s názvom lokálneho súboru!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Súbor sa medzitým zmenil</translation>
      </message>
@@ -2138,22 +2138,22 @@ Nie je vhodné ju používať.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Vybrať čo synchronizovať</translation>
      </message>
@@ -2176,15 +2176,15 @@ Nie je vhodné ju používať.</translation>
          <translation>Veľkosť</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Nastala chyba počas načítavania zoznamu podpriečinkov.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2404,7 +2404,7 @@ Nie je vhodné ju používať.</translation>
      <message>
          <location filename="../src/gui/sharewidget.ui" line="80"/>
          <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
      </message>
      <message>
          <location filename="../src/gui/shareusergroupwidget.cpp" line="268"/>
@@ -2749,6 +2749,11 @@ Nie je vhodné ju používať.</translation>
          <source>Error while reading folder.</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2840,11 +2845,6 @@ Nie je vhodné ju používať.</translation>
          <source>Filename is too long.</source>
          <translation>Meno súboru je veľmi dlhé.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts

index 32be677cfc561de703f3ca0d5fdd38a8b7df2e08..4bbbdd6bd4f02bac00b6b169db0be6c68958487a 100644 (file)
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Prekliči</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Račun</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Izbor predmetov za usklajevanje</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Odstrani povezavo mape usklajevanja</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Ustvarjanje mape je spodletelo</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
          <translation>&lt;p&gt;Ni mogoče ustvariti krajevne mape &lt;i&gt;%1&lt;/i&gt;.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Potrdi odstranjevanje povezave usklajevanja mape</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Odstrani povezavo usklajevanja mape</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Usklajevanje je v teku</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 v uporabi</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
          <translation>%1 kot &lt;i&gt;%2&lt;/i&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Povezano z %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Strežnik %1 trenutno ni dosegljiv.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Uspešno odjavljeno iz %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>Ni povezave z %1 pri %2.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Prijava</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Zaznane so mape, ki zaradi prevelike velikosti niso bile usklajene:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Potrdi odstranitev računa</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Odstrani povezavo</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Odjava</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Nadaljuj z usklajevanjem</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Premor usklajevanja</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 od %2 v uporabi</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Ni nastavljene povezave %1.</translation>
      </message>
@@ -623,46 +623,46 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Ali naj bodo odstranjene vse datoteke?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Odstrani vse datoteke</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Ohrani datoteke</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>Običajno usklajevanje</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1072,7 +1072,7 @@ Skupaj še %5</translation>
          <translation>Odziv strežnika kaže na neveljaven obseg vsebine</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Povezava je časovno potekla</translation>
      </message>
@@ -1833,37 +1833,37 @@ Uporaba ni priporočljiva.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Datoteke %1 ni mogoče prejeti zaradi neskladja z imenom krajevne datoteke!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Prostor na disku je manjši od %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Datoteka je izbrisana s strežnika</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Datoteke ni mogoče v celoti prejeti.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Datoteke %1 ni mogoče shraniti zaradi neskladja z imenom obstoječe datoteke!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Datoteka je bila po spremenjena po usklajevanju seznama datotek.</translation>
      </message>
@@ -2129,22 +2129,22 @@ Uporaba ni priporočljiva.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Izbor map za usklajevanje</translation>
      </message>
@@ -2167,15 +2167,15 @@ Uporaba ni priporočljiva.</translation>
          <translation>Velikost</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Prišlo je do napake med nalaganjem seznama podrejenih map.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2740,6 +2740,11 @@ Uporaba ni priporočljiva.</translation>
          <source>Error while reading folder.</source>
          <translation>Napaka med branjem mape</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2831,11 +2836,6 @@ Uporaba ni priporočljiva.</translation>
          <source>Filename is too long.</source>
          <translation>Ime datoteke je predolgo.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts

index a3a962bb08920fc0dcbb7bb7ed6cd818f4069fcc..80d425f5e574f3923ecfc7ea17a51e635fd822df 100644 (file)
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Одустани</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Налог</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Изаберите шта синхронизовати</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Прављење фасцикле није успело</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Синхронизација у току</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 искоришћено</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Повезан са %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Сервер %1 је привремено недоступан.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Одјављен са %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Пријава</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Нове фасцикле нису синхронизоване јер су превелике:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Потврда уклањања налога</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Уклони везу</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Одјава</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Настави синхронизацију</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Паузирај синхронизацију</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) од %2 искоришћено. Неке фасцикле, укључујући мрежно монтиране или дељене фасцикле, могу имати друга ограничења.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1% од %2 искоришћено</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation>Тренутно нема доступних података о заузећу складишта.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Нема подешене %1 везе.</translation>
      </message>
@@ -623,46 +623,46 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Уклонити све фајлове?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Уклони све фајлове</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Остави фајлове</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1072,7 +1072,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation>Сервер је вратио погрешан опсег садржаја</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Време за повезивање је истекло</translation>
      </message>
@@ -1837,37 +1837,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Фајл %1 се не може преузети јер се судара са називом локалног фајла!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Фајл је обрисан са сервера</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Фајл није могао бити преузет у потпуности.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Фајл %1 се не може сачувати јер се судара са називом локалног фајла!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Фајл је измењен у међувремену</translation>
      </message>
@@ -2139,22 +2139,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
          <translation>Изаберите шта синхронизујете. Изаберите удаљене фасцикле које желите да синхронизујете.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Изаберите шта синхронизовати</translation>
      </message>
@@ -2177,15 +2177,15 @@ It is not advisable to use it.</source>
          <translation>величина</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>На серверу тренутно нема потфасцикли.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Дошло је до грешке при учитавању листе потфасикли.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2750,6 +2750,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2841,11 +2846,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>Назив фајла је предугачак.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts

index fa3cd7abda7594e6503715a9d037244a4e9b0b02..8d673c0c5275b33b2d8ea8c987c9bc3cd5aa87fd 100644 (file)
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Avbryt</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Konto</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Välj vad som ska synkas</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Ta bort anslutning till mappsynkronisering</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Kunde inte skapa mappen</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
          <translation>&lt;p&gt;Kunde inte skapa lokal mapp &lt;i&gt;%1&lt;/i&gt;.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Bekräfta radering av anslutning till mappsynkronisering</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Ta bort anslutning till mappsynkronisering</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Synkronisering pågår</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 används</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
          <translation>%1 som &lt;i&gt;%2&lt;/i&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Ansluten till %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Servern %1 är för tillfället inte tillgänglig.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>Utloggad från %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>Ingen anslutning till %1 vid %2.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Logga in</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Det finns nya mappar som inte synkroniserades på grund av att det är för stora:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Bekräfta radering an kontot</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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;Vill du verkligen avsluta anslutningen till kontot &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Observera:&lt;/b&gt; Detta kommer &lt;b&gt;inte&lt;/b&gt; radera några filer.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Radera anslutning</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Logga ut</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Återuppta synkronisering</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Pausa synkronisering</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;Vill du verkligen avbryta synkronisering av mappen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Observera:&lt;/b&gt; Detta kommer &lt;b&gt;inte&lt;/b&gt; radera några filer.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) av %2 används. Vissa mappar, inklusive nätverks- eller delade mappar, kan ha andra begränsningar.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 av %2 används</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Ingen %1 anslutning konfigurerad.</translation>
      </message>
@@ -312,7 +312,7 @@
      <message>
          <location filename="../src/gui/activityitemdelegate.cpp" line="147"/>
          <source>%1 on %2 (disconnected)</source>
-        <translation type="unfinished"/>
+        <translation>%1 på %2 (frånkopplad)</translation>
      </message>
  </context>
  <context>
@@ -350,17 +350,17 @@
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="451"/>
          <source>The server activity list has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Listan på serveraktivitet har kopierats till urklipp.</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="455"/>
          <source>The sync activity list has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Listan på synkaktivitet har kopierats till urklipp.</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="458"/>
          <source>The list of unsynched items has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>Listan över osynkroniserade objekt har kopierats till urklipp.</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="463"/>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  Var god gå in i inställningarna för att markera mappen om du vill ladda ner den.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,41 +633,43 @@ Detta kan bero på att mappen omkonfigurerats i bakgrunden, eller för att alla
  Är du säker på att du vill fortsätta?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Ta bort alla filer?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Ta bort alla filer</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Behåll filer</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
-        <translation type="unfinished"/>
+        <translation>Denna synkning skulle återställa filerna till en tidigare tidpunkt i synkmappen &apos;%1&apos;.
+Det kan vara på grund av att en backup återställts på servern..
+Om du fortsätter synkningen leder till att dina filer skrivs över av äldre filer i ett tidigare stadium. Vill du spara dina senaste lokala filer som konfliktfiler?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>Backup upptäckt</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>Normal synkronisation</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
-        <translation type="unfinished"/>
+        <translation>Behåll lokala filer som konflikt</translation>
      </message>
  </context>
  <context>
@@ -1075,7 +1077,7 @@ Total tid kvar %5</translation>
          <translation>Servern returnerade felaktig content-range</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Anslutningen avbröts på grund av timeout</translation>
      </message>
@@ -1105,7 +1107,7 @@ Total tid kvar %5</translation>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="101"/>
          <source>MB</source>
-        <translation type="unfinished"/>
+        <translation>MB</translation>
      </message>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="26"/>
@@ -1200,7 +1202,7 @@ Konto: %3
      <message>
          <location filename="../src/gui/ignorelisteditor.ui" line="36"/>
          <source>Files Ignored by Patterns</source>
-        <translation type="unfinished"/>
+        <translation>Filer ignorerade av mönster</translation>
      </message>
      <message>
          <location filename="../src/gui/ignorelisteditor.ui" line="55"/>
@@ -1210,7 +1212,7 @@ Konto: %3
      <message>
          <location filename="../src/gui/ignorelisteditor.ui" line="75"/>
          <source>Pattern</source>
-        <translation type="unfinished"/>
+        <translation>Mönster</translation>
      </message>
      <message>
          <location filename="../src/gui/ignorelisteditor.ui" line="80"/>
@@ -1227,7 +1229,9 @@ Konto: %3
          <source>Files or folders matching a pattern will not be synchronized.
  
  Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
-        <translation type="unfinished"/>
+        <translation>Filer eller mappar som matchar ett möster kommer inte synkroniseras.
+
+Objekt som tillåter radering kommer tas bort om de förhindrar en mapp att tas bort. Det är användbart för meta-data.</translation>
      </message>
      <message>
          <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
@@ -1265,7 +1269,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
      <message>
          <location filename="../src/gui/logbrowser.cpp" line="71"/>
          <source>&amp;Search:</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Sök:</translation>
      </message>
      <message>
          <location filename="../src/gui/logbrowser.cpp" line="79"/>
@@ -1305,7 +1309,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
      <message>
          <location filename="../src/gui/logbrowser.cpp" line="194"/>
          <source>Could not write to log file %1</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte skriva till loggfilen %1</translation>
      </message>
  </context>
  <context>
@@ -1426,7 +1430,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
          <location filename="../src/gui/networksettings.ui" line="250"/>
          <location filename="../src/gui/networksettings.ui" line="282"/>
          <source>Limit to 3/4 of estimated bandwidth</source>
-        <translation type="unfinished"/>
+        <translation>Begränsa till 3/4 av uppskattad bandbredd</translation>
      </message>
      <message>
          <location filename="../src/gui/networksettings.ui" line="269"/>
@@ -1467,7 +1471,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
      <message>
          <location filename="../src/gui/networksettings.cpp" line="128"/>
          <source>Qt &gt;= 5.4 is required in order to use the bandwidth limit</source>
-        <translation type="unfinished"/>
+        <translation>Qt &gt;= 5.4 krävs för att använda begränsning av bandbredd</translation>
      </message>
  </context>
  <context>
@@ -1475,13 +1479,14 @@ Items where deletion is allowed will be deleted if they prevent a directory from
      <message>
          <location filename="../src/gui/updater/ocupdater.cpp" line="103"/>
          <source>New %1 Update Ready</source>
-        <translation type="unfinished"/>
+        <translation>Ny %1 uppdatering tillgänglig</translation>
      </message>
      <message>
          <location filename="../src/gui/updater/ocupdater.cpp" line="104"/>
          <source>A new update for %1 is about to be installed. The updater may ask
  for additional privileges during the process.</source>
-        <translation type="unfinished"/>
+        <translation>En ny uppdatering för %1 kommer installeras. Programmet kan be om
+ytterligare rättigheter under processen.</translation>
      </message>
      <message>
          <location filename="../src/gui/updater/ocupdater.cpp" line="141"/>
@@ -1501,12 +1506,12 @@ for additional privileges during the process.</source>
      <message>
          <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
          <source>%1 version %2 available. Restart application to start the update.</source>
-        <translation type="unfinished"/>
+        <translation>%1 version %2 tillgänglig. Starta om programmet för att starta uppdateringen.</translation>
      </message>
      <message>
          <location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
          <source>New %1 version %2 available. Please use the system&apos;s update tool to install it.</source>
-        <translation type="unfinished"/>
+        <translation>Ny %1 version %2 tillgänglig. Var vänlig använd systemets verktyg för uppdateringar för att installera versionen.</translation>
      </message>
      <message>
          <location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
@@ -1526,7 +1531,7 @@ for additional privileges during the process.</source>
      <message>
          <location filename="../src/gui/updater/ocupdater.cpp" line="177"/>
          <source>Update Check</source>
-        <translation type="unfinished"/>
+        <translation>Uppdateringskontroll</translation>
      </message>
  </context>
  <context>
@@ -1554,12 +1559,12 @@ for additional privileges during the process.</source>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="142"/>
          <source>Sync the folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Synka mappen &apos;%1&apos;</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
          <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Varning:&lt;/strong&gt; Den lokala mappen är inte tom. Välj alternativ!&lt;/small&gt;&lt;/p&gt;</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1583,27 +1588,27 @@ for additional privileges during the process.</source>
      <message>
          <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="43"/>
          <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Failed to connect to the secure server address specified. How do you wish to proceed?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Misslyckades med att upprätta anslutning till den angivna servern. Hur vill du fortsätta?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="55"/>
          <source>Select a different URL</source>
-        <translation type="unfinished"/>
+        <translation>Välj en annan URL</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="62"/>
          <source>Retry unencrypted over HTTP (insecure)</source>
-        <translation type="unfinished"/>
+        <translation>Försök igen okrypterat över HTTP (osäkert)</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.ui" line="69"/>
          <source>Configure client-side TLS certificate</source>
-        <translation type="unfinished"/>
+        <translation>Konfigurera TLS klient-certifikat</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="37"/>
          <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Failed to connect to the secure server address &lt;em&gt;%1&lt;/em&gt;. How do you wish to proceed?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Misslyckades med att ansluta till den säkra serveradressen &lt;em&gt;%1&lt;/em&gt;. Hur vill du gå vidare?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
      </message>
  </context>
  <context>
@@ -1664,7 +1669,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/owncloudsetupwizard.cpp" line="181"/>
          <source>Timeout while trying to connect to %1 at %2.</source>
-        <translation type="unfinished"/>
+        <translation>Försök att ansluta till %1 på %2 tog för lång tid.</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudsetupwizard.cpp" line="192"/>
@@ -1674,17 +1679,17 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/owncloudsetupwizard.cpp" line="239"/>
          <source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
-        <translation type="unfinished"/>
+        <translation>Den autentiserade begäran till servern omdirigerades till &apos;%1&apos;. Den URLen är ogiltig, server är felkonfigurerad.</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudsetupwizard.cpp" line="261"/>
          <source>There was an invalid response to an authenticated webdav request</source>
-        <translation type="unfinished"/>
+        <translation>Det kom ett ogiltigt svar på en autentiserad webdav-begäran</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudsetupwizard.cpp" line="252"/>
          <source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
-        <translation type="unfinished"/>
+        <translation>Åtkomst förbjuden av servern. För att bekräfta att du har korrekta rättigheter, &lt;a href=&quot;%1&quot;&gt;klicka här&lt;/a&gt; för att ansluta till tjänsten med din webb-läsare.</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudsetupwizard.cpp" line="303"/>
@@ -1694,7 +1699,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/owncloudsetupwizard.cpp" line="305"/>
          <source>Creating local sync folder %1...</source>
-        <translation type="unfinished"/>
+        <translation>Skapar lokal synk-mapp %1...</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudsetupwizard.cpp" line="309"/>
@@ -1833,45 +1838,45 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="158"/>
          <source>Invalid JSON reply from the poll URL</source>
-        <translation type="unfinished"/>
+        <translation>Ogiltigt JSON-svar från hämtnings-URLen</translation>
      </message>
  </context>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Fil %1 kan inte laddas ner på grund av namnkonflikt med en lokal fil!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
-        <translation type="unfinished"/>
+        <translation>Nedladdningen skulle innebära ledigt utrymme understiger %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
-        <translation type="unfinished"/>
+        <translation>Ledigt utrymme är under %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
-        <translation type="unfinished"/>
+        <translation>Filen har tagits bort från servern</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Filen kunde inte laddas ner fullständigt.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Fil %1 kan inte sparas eftersom namnet krockar med en lokal fil!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
-        <translation type="unfinished"/>
+        <translation>Filen har ändrats sedan upptäckten</translation>
      </message>
  </context>
  <context>
@@ -1879,17 +1884,17 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="115"/>
          <source>; Restoration Failed: %1</source>
-        <translation type="unfinished"/>
+        <translation>; Återställning misslyckades: %1</translation>
      </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="138"/>
          <source>Continue blacklisting:</source>
-        <translation type="unfinished"/>
+        <translation>Fortsätt svartlista:</translation>
      </message>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="231"/>
          <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
-        <translation type="unfinished"/>
+        <translation>En fil eller mapp togs bort från en skrivskyddad delning, men återställning misslyckades: %1</translation>
      </message>
  </context>
  <context>
@@ -1897,7 +1902,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
          <source>could not delete file %1, error: %2</source>
-        <translation type="unfinished"/>
+        <translation>kunde inte ta bort fil %1, fel: %2</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
@@ -1907,7 +1912,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="169"/>
          <source>could not create folder %1</source>
-        <translation type="unfinished"/>
+        <translation>kunde inte skapa mapp %1</translation>
      </message>
  </context>
  <context>
@@ -1915,12 +1920,12 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="72"/>
          <source>Error removing &apos;%1&apos;: %2;</source>
-        <translation type="unfinished"/>
+        <translation>Fel vid borttagning &apos;%1&apos;: %2;</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
          <source>Could not remove folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Kunde inte ta bort mapp &apos;%1&apos;</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
@@ -1946,7 +1951,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagateremotedelete.cpp" line="115"/>
          <source>Wrong HTTP code returned by server. Expected 204, but received &quot;%1 %2&quot;.</source>
-        <translation type="unfinished"/>
+        <translation>Felaktig HTTP-kod i svaret från servern. &apos;204&apos; förväntades, men &quot;%1 %2&quot; mottogs.</translation>
      </message>
  </context>
  <context>
@@ -1954,7 +1959,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagateremotemkdir.cpp" line="97"/>
          <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
-        <translation type="unfinished"/>
+        <translation>Felaktig HTTP-kod i svaret från servern. &apos;201&apos; förväntades, men &quot;%1 %2&quot; mottogs.</translation>
      </message>
  </context>
  <context>
@@ -1977,7 +1982,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagateremotemove.cpp" line="144"/>
          <source>Wrong HTTP code returned by server. Expected 201, but received &quot;%1 %2&quot;.</source>
-        <translation type="unfinished"/>
+        <translation>Felaktig HTTP-kod i svaret från servern. &apos;201&apos; förväntades, men &quot;%1 %2&quot; mottogs.</translation>
      </message>
  </context>
  <context>
@@ -1990,7 +1995,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="300"/>
          <source>Local file changed during syncing. It will be resumed.</source>
-        <translation type="unfinished"/>
+        <translation>Lokal fil ändrades under synkningen. Den kommer återupptas.</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="312"/>
@@ -2001,7 +2006,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="620"/>
          <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
-        <translation type="unfinished"/>
+        <translation>Tvinga jobbavbryt vid återställning av HTTP-anslutning med Qt &lt; 5.4.2.</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="628"/>
@@ -2011,7 +2016,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="659"/>
          <source>Poll URL missing</source>
-        <translation type="unfinished"/>
+        <translation>Hämtnings-URL saknas</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="682"/>
@@ -2021,7 +2026,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="708"/>
          <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
-        <translation type="unfinished"/>
+        <translation>Servern bekräftade inte senaste leveransen. (Ingen e-tagg fanns)</translation>
      </message>
  </context>
  <context>
@@ -2064,7 +2069,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/protocolwidget.cpp" line="69"/>
          <source>Local sync protocol</source>
-        <translation type="unfinished"/>
+        <translation>Lokalt synkprotokoll</translation>
      </message>
      <message>
          <location filename="../src/gui/protocolwidget.cpp" line="71"/>
@@ -2085,13 +2090,17 @@ Det är inte lämpligt använda den.</translation>
          <location filename="../src/gui/protocolwidget.cpp" line="241"/>
          <source>%n files are ignored because of previous errors.
  </source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n fil ignorerades på grund av tidigare fel.
+</numerusform><numerusform>%n filer ignorerades på grund av tidigare fel.
+</numerusform></translation>
      </message>
      <message numerus="yes">
          <location filename="../src/gui/protocolwidget.cpp" line="242"/>
          <source>%n files are partially downloaded.
  </source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n fil är delvis nedladdad.
+</numerusform><numerusform>%n filer är delvis nedladdade.
+</numerusform></translation>
      </message>
      <message>
          <location filename="../src/gui/protocolwidget.cpp" line="243"/>
@@ -2104,7 +2113,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/proxyauthdialog.ui" line="20"/>
          <source>Proxy authentication required</source>
-        <translation type="unfinished"/>
+        <translation>Proxy-autentisering krävs</translation>
      </message>
      <message>
          <location filename="../src/gui/proxyauthdialog.ui" line="26"/>
@@ -2114,12 +2123,12 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/proxyauthdialog.ui" line="36"/>
          <source>Proxy:</source>
-        <translation type="unfinished"/>
+        <translation>Proxy:</translation>
      </message>
      <message>
          <location filename="../src/gui/proxyauthdialog.ui" line="43"/>
          <source>The proxy server needs a username and password.</source>
-        <translation type="unfinished"/>
+        <translation>Proxy-servern behöver ett användarnamn och lösenord.</translation>
      </message>
      <message>
          <location filename="../src/gui/proxyauthdialog.ui" line="50"/>
@@ -2135,22 +2144,22 @@ Det är inte lämpligt använda den.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
-        <translation type="unfinished"/>
+        <translation>Välj vad som synkas: Välj de fjärrmappar du vill synkronisera.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <source>Choose What to Sync: Deselect remote subfolders you do not wish to synchronize.</source>
-        <translation type="unfinished"/>
+        <translation>Välj vad som synkas: Välj bort de fjärrmappar du inte vill synkronisera.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Välj vad som ska synkas</translation>
      </message>
@@ -2173,14 +2182,14 @@ Det är inte lämpligt använda den.</translation>
          <translation>Storlek</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
-        <translation type="unfinished"/>
+        <translation>Inga undermappar på servern för närvarande.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
          <translation type="unfinished"/>
      </message>
  </context>
@@ -2250,22 +2259,22 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/sharedialog.ui" line="28"/>
          <source>share label</source>
-        <translation type="unfinished"/>
+        <translation>delningsetikett</translation>
      </message>
      <message>
          <location filename="../src/gui/sharedialog.ui" line="14"/>
          <source>Dialog</source>
-        <translation type="unfinished"/>
+        <translation>Dialog</translation>
      </message>
      <message>
          <location filename="../src/gui/sharedialog.ui" line="47"/>
          <source>ownCloud Path:</source>
-        <translation type="unfinished"/>
+        <translation>Sökväg till ownCloud:</translation>
      </message>
      <message>
          <location filename="../src/gui/sharedialog.cpp" line="88"/>
          <source>%1 Sharing</source>
-        <translation type="unfinished"/>
+        <translation>%1 Delning</translation>
      </message>
      <message>
          <location filename="../src/gui/sharedialog.cpp" line="63"/>
@@ -2275,12 +2284,12 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/sharedialog.cpp" line="85"/>
          <source>Folder: %2</source>
-        <translation type="unfinished"/>
+        <translation>Mapp: %2</translation>
      </message>
      <message>
          <location filename="../src/gui/sharedialog.cpp" line="91"/>
          <source>The server does not allow sharing</source>
-        <translation type="unfinished"/>
+        <translation>Servern tillåter inte delning</translation>
      </message>
  </context>
  <context>
@@ -2288,7 +2297,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/sharelinkwidget.ui" line="14"/>
          <source>Share NewDocument.odt</source>
-        <translation type="unfinished"/>
+        <translation>Dela NewDocument.odt</translation>
      </message>
      <message>
          <location filename="../src/gui/sharelinkwidget.ui" line="25"/>
@@ -2303,12 +2312,12 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/sharelinkwidget.ui" line="77"/>
          <source>Set &amp;password </source>
-        <translation type="unfinished"/>
+        <translation>Sätt &amp;lösenord</translation>
      </message>
      <message>
          <location filename="../src/gui/sharelinkwidget.ui" line="91"/>
          <source>Set &amp;expiration date</source>
-        <translation type="unfinished"/>
+        <translation>Sätt datum för &amp;utgång</translation>
      </message>
      <message>
          <location filename="../src/gui/sharelinkwidget.ui" line="115"/>
@@ -2318,7 +2327,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/sharelinkwidget.ui" line="164"/>
          <source>Copy &amp;link</source>
-        <translation type="unfinished"/>
+        <translation>Kopiera &amp;länk</translation>
      </message>
      <message>
          <location filename="../src/gui/sharelinkwidget.ui" line="188"/>
@@ -2328,7 +2337,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/sharelinkwidget.cpp" line="88"/>
          <source>P&amp;assword protect</source>
-        <translation type="unfinished"/>
+        <translation>L&amp;ösenordsskydda</translation>
      </message>
      <message>
          <location filename="../src/gui/sharelinkwidget.cpp" line="203"/>
@@ -2338,24 +2347,24 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/sharelinkwidget.cpp" line="296"/>
          <source>The file can not be shared because it was shared without sharing permission.</source>
-        <translation type="unfinished"/>
+        <translation>Filen kan inte delas eftersom den delades utan delningsrättigheter.</translation>
      </message>
      <message>
          <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
          <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
          <source>Public sh&amp;aring requires a password</source>
-        <translation type="unfinished"/>
+        <translation>Publik d&amp;elning kräver lösenord</translation>
      </message>
      <message>
          <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
          <source>Please Set Password</source>
-        <translation type="unfinished"/>
+        <translation>Var vänlig sätt lösenord</translation>
      </message>
      <message>
          <location filename="../src/gui/sharelinkwidget.cpp" line="505"/>
          <location filename="../src/gui/sharelinkwidget.cpp" line="506"/>
          <source>&amp;Share link</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Dela länk</translation>
      </message>
  </context>
  <context>
@@ -2363,7 +2372,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/shareusergroupwidget.ui" line="14"/>
          <source>Share NewDocument.odt</source>
-        <translation type="unfinished"/>
+        <translation>Dela NewDocument.odt</translation>
      </message>
      <message>
          <location filename="../src/gui/shareusergroupwidget.ui" line="20"/>
@@ -2373,7 +2382,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/shareusergroupwidget.cpp" line="217"/>
          <source>No results for &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Inga resultat för &apos;%1&apos;</translation>
      </message>
  </context>
  <context>
@@ -2566,7 +2575,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/sslbutton.cpp" line="218"/>
          <source>No support for SSL session tickets/identifiers</source>
-        <translation type="unfinished"/>
+        <translation>Inget stöd för biljetter/identifikationer för SSL sessioner</translation>
      </message>
      <message>
          <location filename="../src/gui/sslbutton.cpp" line="229"/>
@@ -2596,12 +2605,12 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/sslerrordialog.cpp" line="66"/>
          <source>Untrusted Certificate</source>
-        <translation type="unfinished"/>
+        <translation>Ej betrott certifikat</translation>
      </message>
      <message>
          <location filename="../src/gui/sslerrordialog.cpp" line="135"/>
          <source>Cannot connect securely to &lt;i&gt;%1&lt;/i&gt;:</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte ansluta säkert till &lt;i&gt;%1&lt;/i&gt;:</translation>
      </message>
      <message>
          <location filename="../src/gui/sslerrordialog.cpp" line="171"/>
@@ -2669,7 +2678,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="107"/>
          <source>CSync failed to load the journal file. The journal file is corrupted.</source>
-        <translation type="unfinished"/>
+        <translation>CSync misslyckades med att ladda journalfilen. Journalfilen är korrupt.</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="110"/>
@@ -2734,33 +2743,38 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="167"/>
          <source>The mounted folder is temporarily not available on the server</source>
-        <translation type="unfinished"/>
+        <translation>Den monterade mappen är tillfälligt otillgänglig på servern</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="173"/>
          <source>An error occurred while opening a folder</source>
-        <translation type="unfinished"/>
+        <translation>En fel inträffande under öppnandet av en mapp</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="176"/>
          <source>Error while reading folder.</source>
+        <translation>Fel vid mappinläsning.</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
          <translation type="unfinished"/>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
          <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
-        <translation type="unfinished"/>
+        <translation>Endast %1 tillgängligt, behöver minst %2 för att starta</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="1068"/>
          <source>Not allowed because you don&apos;t have permission to add parent folder</source>
-        <translation type="unfinished"/>
+        <translation>Otillåtet eftersom du inte har rättigheter att lägga till övermappar</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="1075"/>
          <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
-        <translation type="unfinished"/>
+        <translation>Otillåtet eftersom du inte har rättigheter att lägga till filer i den mappen.</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="155"/>
@@ -2780,42 +2794,42 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="407"/>
          <source>Filename contains invalid characters that can not be synced cross platform.</source>
-        <translation type="unfinished"/>
+        <translation>Filnamnet innehåller otillåtna tecken som inte kan synkroniseras till andra plattformar.</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="149"/>
          <source>CSync failed to access</source>
-        <translation type="unfinished"/>
+        <translation>CSync misslyckades med att läsa</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="103"/>
          <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
-        <translation type="unfinished"/>
+        <translation>CSync misslyckades med att ladda eller skapa journalfilen. Säkerställ att du har rättigheter att läsa och skriva i den lokala synkmappen.</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="146"/>
          <source>CSync failed due to unhandled permission denied.</source>
-        <translation type="unfinished"/>
+        <translation>CSync misslyckades på grund av ohanterad avslagning av rättighet.</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="152"/>
          <source>CSync tried to create a folder that already exists.</source>
-        <translation type="unfinished"/>
+        <translation>CSync försökte skapa en mapp som redan finns.</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="164"/>
          <source>The service is temporarily unavailable</source>
-        <translation type="unfinished"/>
+        <translation>Tjänsten är tillfälligt otillgänglig</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="170"/>
          <source>Access is forbidden</source>
-        <translation type="unfinished"/>
+        <translation>Tillgång förbjuden</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="181"/>
          <source>An internal error number %1 occurred.</source>
-        <translation type="unfinished"/>
+        <translation>Ett internt fel nummer %1 inträffade.</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="236"/>
@@ -2835,17 +2849,12 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="410"/>
          <source>Filename is too long.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
+        <translation>Filnamnet är för långt.</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
-        <translation type="unfinished"/>
+        <translation>Stat misslyckades.</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="446"/>
@@ -2855,7 +2864,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="614"/>
          <source>Invalid characters, please rename &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation>Otillåtna tecken, var vänlig byt namn på &quot;%1&quot;</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="702"/>
@@ -2881,7 +2890,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="1062"/>
          <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
-        <translation type="unfinished"/>
+        <translation>Otillåtet eftersom du inte har rättigheter att lägga till undermappar i den mappen.</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="1095"/>
@@ -2925,7 +2934,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/synclogdialog.ui" line="14"/>
          <source>Synchronisation Log</source>
-        <translation type="unfinished"/>
+        <translation>Synkroniseringslogg</translation>
      </message>
  </context>
  <context>
@@ -2946,7 +2955,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/theme.cpp" line="288"/>
          <source>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Copyright ownCloud, Incorporated&lt;/p&gt;</translation>
      </message>
      <message>
          <location filename="../src/libsync/theme.cpp" line="289"/>
@@ -2959,17 +2968,17 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/checksums.cpp" line="186"/>
          <source>The checksum header is malformed.</source>
-        <translation type="unfinished"/>
+        <translation>Checksummans huvud är felformaterad.</translation>
      </message>
      <message>
          <location filename="../src/libsync/checksums.cpp" line="201"/>
          <source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>Checksummans huvud innehåller en okänd checksumma av typ &apos;%1&apos;</translation>
      </message>
      <message>
          <location filename="../src/libsync/checksums.cpp" line="206"/>
          <source>The downloaded file does not match the checksum, it will be resumed.</source>
-        <translation type="unfinished"/>
+        <translation>Den nedladdade filen stämmer inte med checksumman, den kommer startas om.</translation>
      </message>
  </context>
  <context>
@@ -2997,14 +3006,14 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="316"/>
          <source>Open in browser</source>
-        <translation type="unfinished"/>
+        <translation>Öppna i webbläsare</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="347"/>
          <location filename="../src/gui/owncloudgui.cpp" line="454"/>
          <location filename="../src/gui/owncloudgui.cpp" line="521"/>
          <source>Log in...</source>
-        <translation type="unfinished"/>
+        <translation>Logga in...</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="351"/>
@@ -3066,33 +3075,33 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="251"/>
          <source>Disconnected from %1</source>
-        <translation type="unfinished"/>
+        <translation>Koppla från %1</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="255"/>
          <source>Disconnected from accounts:</source>
-        <translation type="unfinished"/>
+        <translation>Bortkopplad från dessa konton:</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="257"/>
          <source>Account %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>Konto %1: %2</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="444"/>
          <source>Log out of all accounts</source>
-        <translation type="unfinished"/>
+        <translation>Logga ut från alla konton</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="452"/>
          <source>Log in to all accounts...</source>
-        <translation type="unfinished"/>
+        <translation>Logga in på alla konton...</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="527"/>
          <source>Crash now</source>
          <comment>Only shows in debug mode to allow testing the crash handler</comment>
-        <translation type="unfinished"/>
+        <translation>Krascha nu</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="544"/>
@@ -3125,7 +3134,7 @@ Det är inte lämpligt använda den.</translation>
      <message utf8="true">
          <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
          <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;Version %2. För mer information, gå till &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;Av Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz med flera.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensierad under GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud och ownClouds logo är registrerade varumärken av ownCloud, Inc. i USA, andra länder eller både och.&lt;/p&gt;</translation>
      </message>
  </context>
  <context>
@@ -3154,12 +3163,12 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
          <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.&lt;/p&gt;&lt;p&gt;Do not check this if the local content should be uploaded to the servers folder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om denna ruta är kryssad så kommer befintligt innehåll i den lokala mappen tas bort så att en ren synkronisering från servern kan startas.&lt;/p&gt;&lt;p&gt;Kryssa inte i denna ruta om du vill ladda upp det lokala innehållet till serverns mapp.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
          <source>Start a &amp;clean sync (Erases the local folder!)</source>
-        <translation type="unfinished"/>
+        <translation>Starta en %ren synkning (tar bort den lokala mappen!)</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
@@ -3184,7 +3193,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="237"/>
          <source>S&amp;ync everything from server</source>
-        <translation type="unfinished"/>
+        <translation>S&amp;ynka allt från servern</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="319"/>
@@ -3346,37 +3355,37 @@ Det är inte lämpligt använda den.</translation>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="445"/>
          <source>%1 day(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 dag sedan</numerusform><numerusform>%1 dagar sedan</numerusform></translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
          <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>i framtiden</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
          <source>%1 hour(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 timme sedan</numerusform><numerusform>%1 timmar sedan</numerusform></translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
          <source>now</source>
-        <translation type="unfinished"/>
+        <translation>nu</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="460"/>
          <source>Less than a minute ago</source>
-        <translation type="unfinished"/>
+        <translation>Mindre än en minut sedan</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="463"/>
          <source>%1 minute(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 minut sedan</numerusform><numerusform>%1 minuter sedan</numerusform></translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="466"/>
          <source>Some time ago</source>
-        <translation type="unfinished"/>
+        <translation>En stund sedan</translation>
      </message>
  </context>
  <context>
@@ -3404,37 +3413,37 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/utility.cpp" line="305"/>
          <source>%Ln year(s)</source>
-        <translation type="unfinished"/>
+        <translation>%Ln år</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="306"/>
          <source>%Ln month(s)</source>
-        <translation type="unfinished"/>
+        <translation>%Ln månad(er)</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="307"/>
          <source>%Ln day(s)</source>
-        <translation type="unfinished"/>
+        <translation>%Ln dag(ar</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="308"/>
          <source>%Ln hour(s)</source>
-        <translation type="unfinished"/>
+        <translation>%Ln timme/timmar</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="309"/>
          <source>%Ln minute(s)</source>
-        <translation type="unfinished"/>
+        <translation>%Ln minut(er)</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="310"/>
          <source>%Ln second(s)</source>
-        <translation type="unfinished"/>
+        <translation>%Ln sekund(er)</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="320"/>
          <source>0 seconds</source>
-        <translation type="unfinished"/>
+        <translation>0 sekunder</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="335"/>
@@ -3460,7 +3469,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/theme.cpp" line="270"/>
          <source>&lt;p&gt;&lt;small&gt;Built from Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; on %3, %4 using Qt %5, %6&lt;/small&gt;&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;&lt;small&gt;Byggd från Git revision &lt;a href=&quot;%1&quot;&gt;%2&lt;/a&gt; den %3, %4 med Qt %5, %6&lt;/small&gt;&lt;/p&gt;</translation>
      </message>
  </context>
  <context>
@@ -3478,7 +3487,7 @@ Det är inte lämpligt använda den.</translation>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
          <source>Downloaded, renamed conflicting file</source>
-        <translation type="unfinished"/>
+        <translation>Nedladdad, omdöpt konfliktfil</translation>
      </message>
      <message>
          <location filename="../src/libsync/progressdispatcher.cpp" line="39"/>
diff --git a/translations/client_th.ts b/translations/client_th.ts

index 0dde25531b4da90655fb9f93d964e2e510082793..84c29a007f3afc6319add81dc1d1ba649ea5d0ea 100644 (file)
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>ยกเลิก</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>บัญชี</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>เลือกข้อมูลที่ต้องการประสาน</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>ลบโฟลเดอร์ที่ประสานข้อมูลออก</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>สร้างโฟลเดอร์ล้มเหลว</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>ยืนยันการลบโฟลเดอร์ที่ประสานข้อมูลออก</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>ลบโฟลเดอร์ที่ประสานข้อมูล</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>กำลังประสานข้อมูล</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 กำลังถูกใช้งาน</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>เชื่อมต่อกับ %1</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>เซิร์ฟเวอร์ %1 ไม่สามารถใช้ได้ชั่วคราว</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>ลงชื่อออกจาก %1</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>ไม่มีการเชื่อมต่อไปยัง %1 ที่ %2</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>เข้าสู่ระบบ</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>มีโฟลเดอร์ใหม่ที่จะไม่ถูกประสานข้อมูลเพราะมันมีขนาดใหญ่เกินไป</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>ยืนยันการลบบัญชี</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>ลบการเชื่อมต่อ</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>ออกจากระบบ</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>ประสานข้อมูลอีกครั้ง</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>หยุดประสานข้อมูลชั่วคราว</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>มีการใช้งาน %1 (%3%) จาก %2  บางโฟลเดอร์รวมทั้งเครือข่ายที่ติดตั้งหรือโฟลเดอร์ที่แชร์อาจมีข้อจำกัดที่แตกต่างกัน</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>มีการใช้งาน %1 จาก %2</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation>ขณะนี้ไม่มีพื้นที่จัดเก็บข้อมูลที่ใช้งานได้</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  กรุณาไปตั้งค่าถ้าคุณต้องการให้มันดาวน์โหลดได้</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,39 +633,39 @@ Are you sure you want to perform this operation?</source>
  คุณแน่ใจว่าคุณต้องการที่จะดำเนินการนี้?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>ลบไฟล์ทั้งหมด?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>ลบไฟล์ทั้งหมด</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>เก็บไฟล์เอาไว้</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1075,7 +1075,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation>เซิร์ฟเวอร์ส่งคืนช่วงของเนื้อหาที่ผิด</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>หมดเวลาการเชื่อมต่อ</translation>
      </message>
@@ -1841,37 +1841,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>ไฟล์ %1 ไม่สามารถดาวน์โหลดได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>การดาวน์โหลดจะลดพื้นที่ว่างในดิสก์ด้านล่าง %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>พื้นที่ว่างในดิสก์น้อยกว่า %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>ไฟล์ถูกลบออกจากเซิร์ฟเวอร์</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>ไฟล์ไม่สามารถดาวน์โหลดได้อย่างสมบูรณ์</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>ไฟล์ %1 ไม่สามารถบันทึกได้เพราะชื่อไฟล์ต้นทางเหมือนกัน!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>ไฟล์มีการเปลี่ยนแปลงตั้งแต่ถูกพบ</translation>
      </message>
@@ -2137,22 +2137,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
          <translation>เลือกสิ่งที่ต้องการประสานข้อมูล: เลือกโฟลเดอร์ย่อยระยะไกลที่คุณต้องการประสานข้อมูล</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>เลือกสิ่งที่ต้องการประสานข้อมูล</translation>
      </message>
@@ -2175,15 +2175,15 @@ It is not advisable to use it.</source>
          <translation>ขนาด</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>ไม่มีโฟลเดอร์ย่อยอยู่บนเซิร์ฟเวอร์</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>เกิดข้อผิดพลาดขณะโหลดรายชื่อของโฟลเดอร์ย่อย</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2746,6 +2746,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation>เกิดข้อผิดพลาดขณะกำลังอ่านโฟลเดอร์</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2837,11 +2842,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>ชื่อไฟล์ยาวเกินไป</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>ไฟล์จะถูกละเว้นเพราะมีสถานะซ่อนอยู่</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts

index 25b2de79599968da8b6cdda858cd564cf0fe942d..c80c954ee0cb10610a1f0ab3b3c04265ad1580ed 100644 (file)
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>İptal</translation>
      </message>
@@ -123,97 +123,97 @@
          <translation>Hesap</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Ne eşitleneceğini seçin</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>Klasör eşitleme bağlantısını sil</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Klasör oluşturma başarısız oldu</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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; yerel klasörü oluşturulamadı.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>Klasör Eşitleme Bağlantısının Silinmesini Onaylayın</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>Klasör Eşitleme Bağlantısını Sil</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Eşitleme Çalışıyor</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 kullanımda</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>%1 ile bağlı.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>%1 sunucusu geçici olarak ulaşılamaz durumda.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>%1 oturumu sonlandırıldı.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>%1 ile %2 bağlantısı yok.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Giriş yap</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>Çok büyük olduklarından eşitlenmemiş yeni klasörler mevcut:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Hesap Silinmesini Onaylayın</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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; hesabının bağlantısını kaldırmayı gerçekten istiyor musunuz?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Not:&lt;/b&gt; Bu işlem herhangi bir dosyayı &lt;b&gt;silmeyecektir&lt;/b&gt;.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>Bağlantıyı kaldır</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Çıkış yap</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>Eşitlemeye devam et</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>Eşitlemeyi duraklat</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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; klasörünün eşitlemesini durdurmayı gerçekten istiyor musunuz?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Not:&lt;/b&gt; Bu işlem herhangi bir dosyayı &lt;b&gt;silmeyecektir&lt;/b&gt;.&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) / %2 kullanımda. Ağdan bağlanmış veya paylaşılan dizinlerin farklı sınırları olabilir.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>%1 / %2 kullanımda</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <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="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  İndirmek istiyorsanız lütfen ayarlar bölümünden seçin.</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,22 +633,22 @@ Bu, klasörün sessizce yeniden yapılandırılması veya tüm dosyaların el il
  Bu işlemi gerçekleştirmek istediğinize emin misiniz?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Tüm Dosyalar Kaldırılsın mı?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Tüm dosyaları kaldır</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Dosyaları koru</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
@@ -656,17 +656,17 @@ Continuing the sync as normal will cause all your files to be overwritten by an
  Bunun nedeni sunucuda bir yedeğin geri yüklenmesinden dolayı olabilir. Eşitlemeye normal şekilde devam etmek dosyalarınızın daha önceki durumu ile üzerine yazılmasına sebep olacak. Çakışma durumunda en son yerel dosyalarınızı tutmak ister misiniz?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation>Yedek bulundu</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation>Normal Eşitleme</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation>Çakışma Durumunda Yerel Dosyaları Tut</translation>
      </message>
@@ -1076,7 +1076,7 @@ Toplam kalan süre: %5</translation>
          <translation>Sunucu yanlış içerik aralığı döndürdü</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Bağlantı Zaman Aşımı</translation>
      </message>
@@ -1842,37 +1842,37 @@ Kullanmanız önerilmez.</translation>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>%1 dosyası, yerel dosya adı çakışması nedeniyle indirilemiyor!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>Dosya indirimi boş disk alanını %1 altına düşürecektir</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>Boş disk alanı %1 altında</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>Dosya sunucudan silindi</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Dosya tamamıyla indirilemedi.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Yerel bir dosya ismi ile çakıştığından, %1 dosyası kaydedilemedi!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Dosya, bulunduğundan itibaren değişmiş</translation>
      </message>
@@ -2142,22 +2142,22 @@ Kullanmanız önerilmez.</translation>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <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="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Ne Eşitleneceğini Seçin</translation>
      </message>
@@ -2180,15 +2180,15 @@ Kullanmanız önerilmez.</translation>
          <translation>Boyut</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <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="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Alt dizin listesi alınırken bir hata oluştu.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2753,6 +2753,11 @@ Kullanmanız önerilmez.</translation>
          <source>Error while reading folder.</source>
          <translation>Klasör okunurken hata oluştu.</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2844,11 +2849,6 @@ Kullanmanız önerilmez.</translation>
          <source>Filename is too long.</source>
          <translation>Dosya adı çok uzun.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>Dosya gizli olduğundan yoksayıldı.</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts

index dc7cfe63227f5fed4e2267213e3d945b6cb17a2f..5f66f1d5cb63de2852c749d542df48a889f6d3df 100644 (file)
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>Скасувати</translation>
      </message>
@@ -123,143 +123,143 @@
          <translation>Обліковий запис</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>Оберіть, що хочете синхронізувати</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>Не вдалося створити теку</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>Виконується синхронізація</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>Підключено до %1.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>Сервер %1 тимчасово недоступний.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>Увійти</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>Підтвердіть видалення облікового запису</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation type="unfinished"/>
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="208"/>
          <source>Open folder</source>
-        <translation type="unfinished"/>
+        <translation>Відкрити каталог</translation>
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>Вихід</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation>На даний час немає відомостей про наповнення сховища.</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>Жодного %1 підключення не налаштовано.</translation>
      </message>
@@ -345,7 +345,7 @@
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="430"/>
          <source>Not Synced</source>
-        <translation type="unfinished"/>
+        <translation>Не сінхронізовано</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="451"/>
@@ -623,46 +623,46 @@ Please go in the settings to select it if you wish to download it.</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>Видалити усі файли?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>Видалити усі файли</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>Зберегти файли</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>Резервну копію знайдено</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -850,13 +850,13 @@ Continuing the sync as normal will cause all your files to be overwritten by an
          <location filename="../src/gui/folderstatusmodel.cpp" line="844"/>
          <source>, &apos;%1&apos;</source>
          <extracomment>Build a list of file names</extracomment>
-        <translation type="unfinished"/>
+        <translation>, &apos;%1&apos;</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="847"/>
          <source>&apos;%1&apos;</source>
          <extracomment>Argument is a file name</extracomment>
-        <translation type="unfinished"/>
+        <translation>&apos;%1&apos;</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
@@ -921,7 +921,7 @@ Total time left 12 minutes&quot;</extracomment>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="961"/>
          <source>Waiting...</source>
-        <translation type="unfinished"/>
+        <translation>Очикування...</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/gui/folderstatusmodel.cpp" line="963"/>
@@ -1072,7 +1072,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation>Сервер повернув невірний content-range</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>Тайм-аут З&apos;єднання</translation>
      </message>
@@ -1832,37 +1832,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>Файл %1 не завантажено, через локальний конфлікт ім&apos;я! </translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>Файл не може бути завантажений повністю.</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>Файл %1 не збережено, через локальний конфлікт ім&apos;я! </translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>Файл змінився з моменту знаходження</translation>
      </message>
@@ -2134,22 +2134,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
          <translation>Виберіть Що Синхронізувати: Виберіть папки на віддаленому сервері, які Ви хотіли б синхронізувати.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>Оберіть, що хочете синхронізувати</translation>
      </message>
@@ -2172,15 +2172,15 @@ It is not advisable to use it.</source>
          <translation>Розмір</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>На сервері зараз немає підтек.</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>Виникла помилка, поки завантажувався перелік підтек.</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2745,6 +2745,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation type="unfinished"/>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2836,11 +2841,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>Шлях до файлу занадто довгий.</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
@@ -3345,7 +3345,7 @@ It is not advisable to use it.</source>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="445"/>
          <source>%1 day(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 день тому</numerusform><numerusform>%1 днів тому</numerusform><numerusform>%1 днів тому</numerusform></translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
@@ -3355,7 +3355,7 @@ It is not advisable to use it.</source>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
          <source>%1 hour(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 годину тому</numerusform><numerusform>%1 годин тому</numerusform><numerusform>%1 годин тому</numerusform></translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
@@ -3370,7 +3370,7 @@ It is not advisable to use it.</source>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="463"/>
          <source>%1 minute(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%1 хвилину тому</numerusform><numerusform>%1 хвилин тому</numerusform><numerusform>%1 хвилин тому</numerusform></translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="466"/>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts

index e65e25c46d39e1171c68111a36965159df3a7665..32f46ce50b957496308c3ba49793aa6578a0689e 100644 (file)
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -73,7 +73,7 @@
      <message>
          <location filename="../src/gui/accountsettings.ui" line="55"/>
          <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="76"/>
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>取消</translation>
      </message>
@@ -110,7 +110,7 @@
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="137"/>
          <source>Add new</source>
-        <translation type="unfinished"/>
+        <translation>添加</translation>
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="145"/>
@@ -123,97 +123,97 @@
          <translation>账户</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>选择同步内容</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
-        <translation type="unfinished"/>
+        <translation>断开文件夹同步</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>文件夹创建失败</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
-        <translation type="unfinished"/>
+        <translation>确定断开文件夹同步</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
-        <translation type="unfinished"/>
+        <translation>断开文件夹同步</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>同步正在运行</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
-        <translation type="unfinished"/>
+        <translation>%1 使用中</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
-        <translation type="unfinished"/>
+        <translation>%1, &lt;i&gt;%2&lt;/i&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>连接到 %1。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>远程服务器%1暂时不可用。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>从 %1 登出</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>没有到位于%2中的%1的连接</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>登录</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
-        <translation type="unfinished"/>
+        <translation>部分新文件夹没有被同步，因为文件过大：</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>确认删除账号</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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;Note:&lt;/b&gt; 这 &lt;b&gt;不会&lt;/b&gt; 删除任何文件&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>删除连接</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>注销</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>恢复同步</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>暂停同步</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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;你确定要停止文件夹同步？ &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; 这 &lt;b&gt;不会&lt;/b&gt; 删除任何文件&lt;/p&gt;</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
-        <translation type="unfinished"/>
+        <translation>%1 (%3%) of %2 使用中。一些文件夹，例如网络挂载的和共享的文件夹，可能有不同的限制。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
-        <translation type="unfinished"/>
+        <translation>已使用 %2，总计 %1%</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation>目前没有储存使用量信息可用。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>没有 %1 连接配置。</translation>
      </message>
@@ -307,12 +307,12 @@
      <message>
          <location filename="../src/gui/activityitemdelegate.cpp" line="145"/>
          <source>%1 on %2</source>
-        <translation type="unfinished"/>
+        <translation>%1, %2</translation>
      </message>
      <message>
          <location filename="../src/gui/activityitemdelegate.cpp" line="147"/>
          <source>%1 on %2 (disconnected)</source>
-        <translation type="unfinished"/>
+        <translation>%1, %2 (连接已断开)</translation>
      </message>
  </context>
  <context>
@@ -320,7 +320,7 @@
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="409"/>
          <source>Server Activity</source>
-        <translation type="unfinished"/>
+        <translation>服务器动态</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="414"/>
@@ -330,7 +330,7 @@
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="420"/>
          <source>List of ignored or erroneous files</source>
-        <translation type="unfinished"/>
+        <translation>忽视或错误的文件列表</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="424"/>
@@ -345,22 +345,22 @@
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="430"/>
          <source>Not Synced</source>
-        <translation type="unfinished"/>
+        <translation>未同步</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="451"/>
          <source>The server activity list has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>服务器动态已被复制到剪贴板。</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="455"/>
          <source>The sync activity list has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>同步动态已被复制到剪贴板。</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="458"/>
          <source>The list of unsynched items has been copied to the clipboard.</source>
-        <translation type="unfinished"/>
+        <translation>未同步项已被复制到剪贴板。</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="463"/>
@@ -384,7 +384,7 @@
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="314"/>
          <source>Server Activities</source>
-        <translation type="unfinished"/>
+        <translation>服务器动态</translation>
      </message>
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="287"/>
@@ -399,7 +399,7 @@
      <message>
          <location filename="../src/gui/activitywidget.cpp" line="321"/>
          <source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
-        <translation type="unfinished"/>
+        <translation>&lt;br/&gt;帐户%1没有同步活动。</translation>
      </message>
  </context>
  <context>
@@ -620,51 +620,56 @@
          <location filename="../src/gui/folder.cpp" line="1166"/>
          <source>A new folder larger than %1 MB has been added: %2.
  Please go in the settings to select it if you wish to download it.</source>
-        <translation type="unfinished"/>
+        <translation>新文件夹 %2 添加成功，大于 %1 MB。
+请前往设置选择是否下载。</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
-        <translation type="unfinished"/>
+        <translation>这个同步将会移除在同步文件夹 %1 下的所有文件。
+这可能因为该文件夹被默默地重新配置过，或者所有的文件被手动地移除了。
+你确定执行该操作吗？</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>删除所有文件？</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>删除所有文件</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>保持所有文件</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
-        <translation type="unfinished"/>
+        <translation>本次同步将会重置同步文件夹 %1 下的所有文件。
+这可能是因为在服务器上的备份被恢复。
+继续同步将会导致所有你的文件被之前的状态覆盖，你是否保留本地的文件？</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
-        <translation type="unfinished"/>
+        <translation>备份已删除</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
-        <translation type="unfinished"/>
+        <translation>正常同步</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
-        <translation type="unfinished"/>
+        <translation>保留本地文件为冲突文件</translation>
      </message>
  </context>
  <context>
@@ -682,12 +687,12 @@ Continuing the sync as normal will cause all your files to be overwritten by an
      <message>
          <location filename="../src/gui/folderman.cpp" line="885"/>
          <source> (backup)</source>
-        <translation type="unfinished"/>
+        <translation> (备份)</translation>
      </message>
      <message>
          <location filename="../src/gui/folderman.cpp" line="890"/>
          <source> (backup %1)</source>
-        <translation type="unfinished"/>
+        <translation> (备份 %1)</translation>
      </message>
      <message>
          <location filename="../src/gui/folderman.cpp" line="1099"/>
@@ -697,7 +702,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
      <message>
          <location filename="../src/gui/folderman.cpp" line="1102"/>
          <source>Waiting to start syncing.</source>
-        <translation type="unfinished"/>
+        <translation>等待启动同步。</translation>
      </message>
      <message>
          <location filename="../src/gui/folderman.cpp" line="1105"/>
@@ -757,27 +762,27 @@ Continuing the sync as normal will cause all your files to be overwritten by an
      <message>
          <location filename="../src/gui/folderman.cpp" line="1169"/>
          <source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>本地文件夹 %1 是正在使用的同步文件夹，请选择另一个！</translation>
      </message>
      <message>
          <location filename="../src/gui/folderman.cpp" line="1174"/>
          <source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>本地文件夹 %1 包含有正在使用的同步文件夹，请选择另一个！</translation>
      </message>
      <message>
          <location filename="../src/gui/folderman.cpp" line="1181"/>
          <source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>选择的文件夹 %1 是一个符号连接，连接指向的是正在使用的同步文件夹，请选择另一个！</translation>
      </message>
      <message>
          <location filename="../src/gui/folderman.cpp" line="1188"/>
          <source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>本地文件夹 %1 是正在使用的同步文件夹，请选择另一个！</translation>
      </message>
      <message>
          <location filename="../src/gui/folderman.cpp" line="1194"/>
          <source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
-        <translation type="unfinished"/>
+        <translation>选择的文件夹 %1 是一个符号连接，连接指向的是正在使用的同步文件夹，请选择另一个！</translation>
      </message>
  </context>
  <context>
@@ -785,7 +790,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
      <message>
          <location filename="../src/gui/folderstatusdelegate.cpp" line="45"/>
          <source>Add Folder Sync Connection</source>
-        <translation type="unfinished"/>
+        <translation>添加同步文件夹</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusdelegate.cpp" line="290"/>
@@ -795,7 +800,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
      <message>
          <location filename="../src/gui/folderstatusdelegate.cpp" line="243"/>
          <source>Syncing selected files in your account with</source>
-        <translation type="unfinished"/>
+        <translation>同步已选择的文件: </translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusdelegate.cpp" line="246"/>
@@ -813,18 +818,18 @@ Continuing the sync as normal will cause all your files to be overwritten by an
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="137"/>
          <source>Click this button to add a folder to synchronize.</source>
-        <translation type="unfinished"/>
+        <translation>点击选择进行同步的本地文件夹。</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="148"/>
          <source>%1 (%2)</source>
          <extracomment>Example text: &quot;File.txt (23KB)&quot;</extracomment>
-        <translation type="unfinished"/>
+        <translation>%1 (%2)</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="167"/>
          <source>Error while loading the list of folders from the server.</source>
-        <translation type="unfinished"/>
+        <translation>载入文件夹列表时发生错误。</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="201"/>
@@ -834,29 +839,29 @@ Continuing the sync as normal will cause all your files to be overwritten by an
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="132"/>
          <source>Adding folder is disabled because you are already syncing all your files. If you want to sync multiple folders, please remove the currently configured root folder.</source>
-        <translation type="unfinished"/>
+        <translation>你已经设置同步了你的所有文件，无法同步另一文件夹。要同步多个文件夹，请取消当前设置的根文件夹同步。</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="169"/>
          <source>Fetching folder list from server...</source>
-        <translation type="unfinished"/>
+        <translation>获取文件夹列表...</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="809"/>
          <source>Checking for changes in &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>在 %1 检查更改</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="844"/>
          <source>, &apos;%1&apos;</source>
          <extracomment>Build a list of file names</extracomment>
-        <translation type="unfinished"/>
+        <translation>, &apos;%1&apos;</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="847"/>
          <source>&apos;%1&apos;</source>
          <extracomment>Argument is a file name</extracomment>
-        <translation type="unfinished"/>
+        <translation>&apos;%1&apos;</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="872"/>
@@ -874,7 +879,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
          <location filename="../src/gui/folderstatusmodel.cpp" line="878"/>
          <source>download %1/s</source>
          <extracomment>Example text: &quot;download 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
-        <translation type="unfinished"/>
+        <translation>下载 %1/s</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="880"/>
@@ -885,7 +890,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
          <location filename="../src/gui/folderstatusmodel.cpp" line="887"/>
          <source>upload %1/s</source>
          <extracomment>Example text: &quot;upload 24Kb/s&quot; (%1 is replaced by 24Kb (translated))</extracomment>
-        <translation type="unfinished"/>
+        <translation>上传 %1/s</translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="889"/>
@@ -926,12 +931,12 @@ Total time left 12 minutes&quot;</extracomment>
      <message numerus="yes">
          <location filename="../src/gui/folderstatusmodel.cpp" line="963"/>
          <source>Waiting for %n other folder(s)...</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
+        <translation><numerusform>等待 %n 个其他文件(文件夹)</numerusform></translation>
      </message>
      <message>
          <location filename="../src/gui/folderstatusmodel.cpp" line="969"/>
          <source>Preparing to sync...</source>
-        <translation type="unfinished"/>
+        <translation>准备同步...</translation>
      </message>
  </context>
  <context>
@@ -939,12 +944,12 @@ Total time left 12 minutes&quot;</extracomment>
      <message>
          <location filename="../src/gui/folderwizard.cpp" line="562"/>
          <source>Add Folder Sync Connection</source>
-        <translation type="unfinished"/>
+        <translation>添加同步文件夹</translation>
      </message>
      <message>
          <location filename="../src/gui/folderwizard.cpp" line="564"/>
          <source>Add Sync Connection</source>
-        <translation type="unfinished"/>
+        <translation>添加同步连接</translation>
      </message>
  </context>
  <context>
@@ -962,7 +967,7 @@ Total time left 12 minutes&quot;</extracomment>
      <message>
          <location filename="../src/gui/folderwizard.cpp" line="81"/>
          <source>The folder alias is a descriptive name for this sync connection.</source>
-        <translation type="unfinished"/>
+        <translation>目录别名</translation>
      </message>
      <message>
          <location filename="../src/gui/folderwizard.cpp" line="115"/>
@@ -1010,7 +1015,7 @@ Total time left 12 minutes&quot;</extracomment>
      <message>
          <location filename="../src/gui/folderwizard.cpp" line="271"/>
          <source>Failed to list a folder. Error: %1</source>
-        <translation type="unfinished"/>
+        <translation>列表失败。错误: %1</translation>
      </message>
      <message>
          <location filename="../src/gui/folderwizard.cpp" line="351"/>
@@ -1072,7 +1077,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation>服务器返回了错误的内容长度</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>连接超时</translation>
      </message>
@@ -1092,7 +1097,7 @@ Total time left 12 minutes&quot;</extracomment>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="40"/>
          <source>For System Tray</source>
-        <translation type="unfinished"/>
+        <translation>系统托盘</translation>
      </message>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="53"/>
@@ -1107,32 +1112,32 @@ Total time left 12 minutes&quot;</extracomment>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="26"/>
          <source>&amp;Launch on System Startup</source>
-        <translation type="unfinished"/>
+        <translation>在系统启动时启动</translation>
      </message>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="33"/>
          <source>Show &amp;Desktop Notifications</source>
-        <translation type="unfinished"/>
+        <translation>显示桌面提醒</translation>
      </message>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="43"/>
          <source>Use &amp;Monochrome Icons</source>
-        <translation type="unfinished"/>
+        <translation>使用单色图标</translation>
      </message>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="59"/>
          <source>Edit &amp;Ignored Files</source>
-        <translation type="unfinished"/>
+        <translation>编辑忽略的文件</translation>
      </message>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="81"/>
          <source>Ask &amp;confirmation before downloading folders larger than</source>
-        <translation type="unfinished"/>
+        <translation>提醒并需要我确认，当下载文件夹大于</translation>
      </message>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="129"/>
          <source>S&amp;how crash reporter</source>
-        <translation type="unfinished"/>
+        <translation>显示崩溃报告器</translation>
      </message>
      <message>
          <location filename="../src/gui/generalsettings.ui" line="156"/>
@@ -1160,12 +1165,15 @@ Total time left 12 minutes&quot;</extracomment>
  User: %2
  Account: %3
  </source>
-        <translation type="unfinished"/>
+        <translation>请输入账户 %2 的密码：
+
+用户: %2
+账户: %3</translation>
      </message>
      <message>
          <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="40"/>
          <source>Reading from keychain failed with error: &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>获取密钥链失败，错误: &apos;%1&apos;</translation>
      </message>
      <message>
          <location filename="../src/gui/creds/httpcredentialsgui.cpp" line="45"/>
@@ -1193,7 +1201,7 @@ Account: %3
      <message>
          <location filename="../src/gui/ignorelisteditor.ui" line="36"/>
          <source>Files Ignored by Patterns</source>
-        <translation type="unfinished"/>
+        <translation>文件忽略模式：</translation>
      </message>
      <message>
          <location filename="../src/gui/ignorelisteditor.ui" line="55"/>
@@ -1203,7 +1211,7 @@ Account: %3
      <message>
          <location filename="../src/gui/ignorelisteditor.ui" line="75"/>
          <source>Pattern</source>
-        <translation type="unfinished"/>
+        <translation>模式</translation>
      </message>
      <message>
          <location filename="../src/gui/ignorelisteditor.ui" line="80"/>
@@ -1220,7 +1228,9 @@ Account: %3
          <source>Files or folders matching a pattern will not be synchronized.
  
  Items where deletion is allowed will be deleted if they prevent a directory from being removed. This is useful for meta data.</source>
-        <translation type="unfinished"/>
+        <translation>匹配到模式的文件或文件夹将不会被同步。
+
+如果选中的项目正在阻止文件夹的删除，它们也会被删除。这对于元数据很有用。</translation>
      </message>
      <message>
          <location filename="../src/gui/ignorelisteditor.cpp" line="110"/>
@@ -1419,7 +1429,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
          <location filename="../src/gui/networksettings.ui" line="250"/>
          <location filename="../src/gui/networksettings.ui" line="282"/>
          <source>Limit to 3/4 of estimated bandwidth</source>
-        <translation type="unfinished"/>
+        <translation>限制使用 3/4  的带宽</translation>
      </message>
      <message>
          <location filename="../src/gui/networksettings.ui" line="269"/>
@@ -1460,7 +1470,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
      <message>
          <location filename="../src/gui/networksettings.cpp" line="128"/>
          <source>Qt &gt;= 5.4 is required in order to use the bandwidth limit</source>
-        <translation type="unfinished"/>
+        <translation>速度限制需要 QT&gt;=5.4</translation>
      </message>
  </context>
  <context>
@@ -1494,12 +1504,12 @@ for additional privileges during the process.</source>
      <message>
          <location filename="../src/gui/updater/ocupdater.cpp" line="143"/>
          <source>%1 version %2 available. Restart application to start the update.</source>
-        <translation type="unfinished"/>
+        <translation>%1 版本 %2 现在可用，请重启应用以开始更新。</translation>
      </message>
      <message>
          <location filename="../src/gui/updater/ocupdater.cpp" line="149"/>
          <source>New %1 version %2 available. Please use the system&apos;s update tool to install it.</source>
-        <translation type="unfinished"/>
+        <translation>%1 新版本 %2 已经可用，使用系统更新工具升级。</translation>
      </message>
      <message>
          <location filename="../src/gui/updater/ocupdater.cpp" line="151"/>
@@ -1552,7 +1562,7 @@ for additional privileges during the process.</source>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="147"/>
          <source>&lt;p&gt;&lt;small&gt;&lt;strong&gt;Warning:&lt;/strong&gt; The local folder is not empty. Pick a resolution!&lt;/small&gt;&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;&lt;small&gt;&lt;strong&gt;警告：&lt;/strong&gt; 本地目录非空。选择一个操作！&lt;/small&gt;&lt;/p&gt;</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="246"/>
@@ -1596,7 +1606,7 @@ for additional privileges during the process.</source>
      <message>
          <location filename="../src/gui/wizard/owncloudconnectionmethoddialog.cpp" line="37"/>
          <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Failed to connect to the secure server address &lt;em&gt;%1&lt;/em&gt;. How do you wish to proceed?&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;无法连接到指定地址的安全服务器 &lt;em&gt;%1&lt;/em&gt;。请问是否继续？&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
      </message>
  </context>
  <context>
@@ -1831,37 +1841,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>由于本地文件名冲突，文件 %1 无法下载。</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
-        <translation type="unfinished"/>
+        <translation>下载将会使用 %1 的磁盘空间</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
-        <translation type="unfinished"/>
+        <translation>空闲磁盘空间少于 %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>已从服务器删除文件</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>文件无法完整下载。</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>由于本地文件名冲突，文件 %1 无法保存。</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>自从发现文件以来，它已经被改变了</translation>
      </message>
@@ -1881,7 +1891,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/owncloudpropagator.cpp" line="231"/>
          <source>A file or folder was removed from a read only share, but restoring failed: %1</source>
-        <translation type="unfinished"/>
+        <translation>文件（夹）移除了只读共享，但恢复失败：%1</translation>
      </message>
  </context>
  <context>
@@ -1889,7 +1899,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="155"/>
          <source>could not delete file %1, error: %2</source>
-        <translation type="unfinished"/>
+        <translation>不能删除文件 %1, 错误: %2</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="163"/>
@@ -1912,7 +1922,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="98"/>
          <source>Could not remove folder &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>无法删除文件夹 %1</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagatorjobs.cpp" line="116"/>
@@ -1982,7 +1992,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="300"/>
          <source>Local file changed during syncing. It will be resumed.</source>
-        <translation type="unfinished"/>
+        <translation>本地文件在同步时已修改，完成后会再次同步</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="312"/>
@@ -1993,7 +2003,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="620"/>
          <source>Forcing job abort on HTTP connection reset with Qt &lt; 5.4.2.</source>
-        <translation type="unfinished"/>
+        <translation>Qt &lt; 5.4.2 时强制中止连接重置。</translation>
      </message>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="628"/>
@@ -2013,7 +2023,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/propagateupload.cpp" line="708"/>
          <source>The server did not acknowledge the last chunk. (No e-tag was present)</source>
-        <translation type="unfinished"/>
+        <translation>服务器找不到上一分块。(找不到 E-tag)</translation>
      </message>
  </context>
  <context>
@@ -2056,7 +2066,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/protocolwidget.cpp" line="69"/>
          <source>Local sync protocol</source>
-        <translation type="unfinished"/>
+        <translation>本地同步协议</translation>
      </message>
      <message>
          <location filename="../src/gui/protocolwidget.cpp" line="71"/>
@@ -2129,22 +2139,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
          <translation>选择同步内容（选中需同步的远程子文件夹）</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>选择同步内容</translation>
      </message>
@@ -2167,15 +2177,15 @@ It is not advisable to use it.</source>
          <translation>大小</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>这个服务器上暂不存在子文件夹。</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>载入子文件夹列表时发生错误。</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2249,7 +2259,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/sharedialog.ui" line="14"/>
          <source>Dialog</source>
-        <translation type="unfinished"/>
+        <translation>对话框</translation>
      </message>
      <message>
          <location filename="../src/gui/sharedialog.ui" line="47"/>
@@ -2274,7 +2284,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/sharedialog.cpp" line="91"/>
          <source>The server does not allow sharing</source>
-        <translation type="unfinished"/>
+        <translation>服务器不支持共享</translation>
      </message>
  </context>
  <context>
@@ -2338,7 +2348,7 @@ It is not advisable to use it.</source>
          <location filename="../src/gui/sharelinkwidget.cpp" line="373"/>
          <location filename="../src/gui/sharelinkwidget.cpp" line="419"/>
          <source>Public sh&amp;aring requires a password</source>
-        <translation type="unfinished"/>
+        <translation>公开分享需要密码</translation>
      </message>
      <message>
          <location filename="../src/gui/sharelinkwidget.cpp" line="441"/>
@@ -2367,7 +2377,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/shareusergroupwidget.cpp" line="217"/>
          <source>No results for &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>没有 &apos;%1&apos; 相关结果</translation>
      </message>
  </context>
  <context>
@@ -2395,7 +2405,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/sharewidget.ui" line="80"/>
          <source>...</source>
-        <translation type="unfinished"/>
+        <translation>...</translation>
      </message>
      <message>
          <location filename="../src/gui/shareusergroupwidget.cpp" line="268"/>
@@ -2560,7 +2570,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/sslbutton.cpp" line="218"/>
          <source>No support for SSL session tickets/identifiers</source>
-        <translation type="unfinished"/>
+        <translation>没有支持的 SSL 标识</translation>
      </message>
      <message>
          <location filename="../src/gui/sslbutton.cpp" line="229"/>
@@ -2590,12 +2600,12 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/sslerrordialog.cpp" line="66"/>
          <source>Untrusted Certificate</source>
-        <translation type="unfinished"/>
+        <translation>不被信任的证书</translation>
      </message>
      <message>
          <location filename="../src/gui/sslerrordialog.cpp" line="135"/>
          <source>Cannot connect securely to &lt;i&gt;%1&lt;/i&gt;:</source>
-        <translation type="unfinished"/>
+        <translation>无法安全连接到 &lt;i&gt;%1&lt;/i&gt;: </translation>
      </message>
      <message>
          <location filename="../src/gui/sslerrordialog.cpp" line="171"/>
@@ -2698,7 +2708,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="128"/>
          <source>CSync could not authenticate at the proxy.</source>
-        <translation type="unfinished"/>
+        <translation>CSync 代理认证失败。</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="131"/>
@@ -2728,33 +2738,38 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="167"/>
          <source>The mounted folder is temporarily not available on the server</source>
-        <translation type="unfinished"/>
+        <translation>该文件夹在服务器上不可用</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="173"/>
          <source>An error occurred while opening a folder</source>
-        <translation type="unfinished"/>
+        <translation>打开目录失败</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="176"/>
          <source>Error while reading folder.</source>
+        <translation>读取目录时出错</translation>
+    </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
          <translation type="unfinished"/>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
          <comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
-        <translation type="unfinished"/>
+        <translation>仅有 %1 有效，至少需要 %2 才能开始</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="1068"/>
          <source>Not allowed because you don&apos;t have permission to add parent folder</source>
-        <translation type="unfinished"/>
+        <translation>你没有权限增加父目录</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="1075"/>
          <source>Not allowed because you don&apos;t have permission to add files in that folder</source>
-        <translation type="unfinished"/>
+        <translation>你没有权限增加文件</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="155"/>
@@ -2774,27 +2789,27 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="407"/>
          <source>Filename contains invalid characters that can not be synced cross platform.</source>
-        <translation type="unfinished"/>
+        <translation>文件包含无效字符无法跨平台同步。</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="149"/>
          <source>CSync failed to access</source>
-        <translation type="unfinished"/>
+        <translation>访问 CSync 失败</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="103"/>
          <source>CSync failed to load or create the journal file. Make sure you have read and write permissions in the local sync folder.</source>
-        <translation type="unfinished"/>
+        <translation>Csync同步失败，请确定是否有本地同步目录的读写权</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="146"/>
          <source>CSync failed due to unhandled permission denied.</source>
-        <translation type="unfinished"/>
+        <translation>出于未处理的权限拒绝，CSync 失败。</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="152"/>
          <source>CSync tried to create a folder that already exists.</source>
-        <translation type="unfinished"/>
+        <translation>CSync 尝试创建了已有的文件夹。</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="164"/>
@@ -2804,7 +2819,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="170"/>
          <source>Access is forbidden</source>
-        <translation type="unfinished"/>
+        <translation>访问被拒绝</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="181"/>
@@ -2814,7 +2829,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="236"/>
          <source>The item is not synced because of previous errors: %1</source>
-        <translation type="unfinished"/>
+        <translation>文件没有被同步因为之前的错误: %1</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="401"/>
@@ -2831,15 +2846,10 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>文件名过长。</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation type="unfinished"/>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
-        <translation type="unfinished"/>
+        <translation>状态失败。</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="446"/>
@@ -2849,7 +2859,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="614"/>
          <source>Invalid characters, please rename &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation>无效的字符，请更改为 “%1”</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="702"/>
@@ -2875,7 +2885,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="1062"/>
          <source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
-        <translation type="unfinished"/>
+        <translation>你没有权限增加子目录</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="1095"/>
@@ -2896,7 +2906,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="1200"/>
          <source>Move not allowed, item restored</source>
-        <translation type="unfinished"/>
+        <translation>无法移动，正在回退</translation>
      </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="1209"/>
@@ -2919,7 +2929,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/synclogdialog.ui" line="14"/>
          <source>Synchronisation Log</source>
-        <translation type="unfinished"/>
+        <translation>同步日志</translation>
      </message>
  </context>
  <context>
@@ -2945,7 +2955,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/theme.cpp" line="289"/>
          <source>&lt;p&gt;Distributed by %1 and licensed under the GNU General Public License (GPL) Version 2.0.&lt;br/&gt;%2 and the %2 logo are registered trademarks of %1 in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;%1 使用GNU通用公共许可证 (GPL) 2.0。&lt;br/&gt;%2 以及 %2 标识已由 %1 注册使用。&lt;/p&gt;</translation>
      </message>
  </context>
  <context>
@@ -2953,17 +2963,17 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/checksums.cpp" line="186"/>
          <source>The checksum header is malformed.</source>
-        <translation type="unfinished"/>
+        <translation>校验异常</translation>
      </message>
      <message>
          <location filename="../src/libsync/checksums.cpp" line="201"/>
          <source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>校验头包含未知的校验类型 &apos;%1&apos;</translation>
      </message>
      <message>
          <location filename="../src/libsync/checksums.cpp" line="206"/>
          <source>The downloaded file does not match the checksum, it will be resumed.</source>
-        <translation type="unfinished"/>
+        <translation>下载文件娇艳失败，将会回退。</translation>
      </message>
  </context>
  <context>
@@ -2986,7 +2996,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="308"/>
          <source>There are no sync folders configured.</source>
-        <translation type="unfinished"/>
+        <translation>没有已配置的同步文件夹。</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="316"/>
@@ -2998,7 +3008,7 @@ It is not advisable to use it.</source>
          <location filename="../src/gui/owncloudgui.cpp" line="454"/>
          <location filename="../src/gui/owncloudgui.cpp" line="521"/>
          <source>Log in...</source>
-        <translation type="unfinished"/>
+        <translation>登录</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="351"/>
@@ -3015,7 +3025,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="566"/>
          <source>Checking for changes in &apos;%1&apos;</source>
-        <translation type="unfinished"/>
+        <translation>检查 %1 的更改</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="335"/>
@@ -3060,27 +3070,27 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="251"/>
          <source>Disconnected from %1</source>
-        <translation type="unfinished"/>
+        <translation>已从服务器断开 %1</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="255"/>
          <source>Disconnected from accounts:</source>
-        <translation type="unfinished"/>
+        <translation>已断开账户: </translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="257"/>
          <source>Account %1: %2</source>
-        <translation type="unfinished"/>
+        <translation>账户 %1: %2</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="444"/>
          <source>Log out of all accounts</source>
-        <translation type="unfinished"/>
+        <translation>注销所有账户</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="452"/>
          <source>Log in to all accounts...</source>
-        <translation type="unfinished"/>
+        <translation>登录所有账户</translation>
      </message>
      <message>
          <location filename="../src/gui/owncloudgui.cpp" line="527"/>
@@ -3119,7 +3129,7 @@ It is not advisable to use it.</source>
      <message utf8="true">
          <location filename="../src/libsync/owncloudtheme.cpp" line="47"/>
          <source>&lt;p&gt;Version %2. For more information visit &lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;Copyright ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;p&gt;版本 %2，更多信息请访问&lt;a href=&quot;%3&quot;&gt;%4&lt;/a&gt;&lt;/p&gt;&lt;p&gt;&lt;small&gt;By Klaas Freitag, Daniel Molkentin, Jan-Christoph Borchardt, Olivier Goffart, Markus Götz and others.&lt;/small&gt;&lt;/p&gt;&lt;p&gt;版权所有 ownCloud, Inc.&lt;/p&gt;&lt;p&gt;Licensed under the GNU General Public License (GPL) Version 2.0&lt;br/&gt;ownCloud and the ownCloud Logo are registered trademarks of ownCloud, Inc. in the United States, other countries, or both.&lt;/p&gt;</translation>
      </message>
  </context>
  <context>
@@ -3148,12 +3158,12 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="200"/>
          <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If this box is checked, existing content in the local folder will be erased to start a clean sync from the server.&lt;/p&gt;&lt;p&gt;Do not check this if the local content should be uploaded to the servers folder.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;当该选项被勾选，当前目录的内容将被删除，并开始同步服务器内容。&lt;/p&gt;&lt;p&gt;如果本地内容要被上传到服务器，不要勾选该选项。&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="203"/>
          <source>Start a &amp;clean sync (Erases the local folder!)</source>
-        <translation type="unfinished"/>
+        <translation>开始全新同步 (将清空本地文件夹！)</translation>
      </message>
      <message>
          <location filename="../src/gui/wizard/owncloudadvancedsetuppage.ui" line="278"/>
@@ -3332,7 +3342,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/gui/application.cpp" line="571"/>
          <source>QT_LAYOUT_DIRECTION</source>
-        <translation type="unfinished"/>
+        <translation>QT_LAYOUT_DIRECTION</translation>
      </message>
  </context>
  <context>
@@ -3340,37 +3350,37 @@ It is not advisable to use it.</source>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="445"/>
          <source>%1 day(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
+        <translation><numerusform>%1 天以前</numerusform></translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="449"/>
          <source>in the future</source>
-        <translation type="unfinished"/>
+        <translation>将来</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="453"/>
          <source>%1 hour(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
+        <translation><numerusform>%1 小时前</numerusform></translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="458"/>
          <source>now</source>
-        <translation type="unfinished"/>
+        <translation>现在</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="460"/>
          <source>Less than a minute ago</source>
-        <translation type="unfinished"/>
+        <translation>刚刚</translation>
      </message>
      <message numerus="yes">
          <location filename="../src/libsync/utility.cpp" line="463"/>
          <source>%1 minute(s) ago</source>
-        <translation type="unfinished"><numerusform></numerusform></translation>
+        <translation><numerusform>%1 分钟前</numerusform></translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="466"/>
          <source>Some time ago</source>
-        <translation type="unfinished"/>
+        <translation>之前</translation>
      </message>
  </context>
  <context>
@@ -3388,7 +3398,7 @@ It is not advisable to use it.</source>
      <message>
          <location filename="../src/libsync/utility.cpp" line="127"/>
          <source>%L1 KB</source>
-        <translation type="unfinished"/>
+        <translation>%L1 KB</translation>
      </message>
      <message>
          <location filename="../src/libsync/utility.cpp" line="130"/>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts

index 0181218898b0b7a48ef852ab71395aeae73d6361..06d433f995f3d7bc1973edfdea2ab2f2c6447e60 100644 (file)
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -92,8 +92,8 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.ui" line="180"/>
-        <location filename="../src/gui/accountsettings.cpp" line="339"/>
-        <location filename="../src/gui/accountsettings.cpp" line="675"/>
+        <location filename="../src/gui/accountsettings.cpp" line="341"/>
+        <location filename="../src/gui/accountsettings.cpp" line="677"/>
          <source>Cancel</source>
          <translation>取消</translation>
      </message>
@@ -110,7 +110,7 @@
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="137"/>
          <source>Add new</source>
-        <translation>以新增方式加入</translation>
+        <translation>新增</translation>
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="145"/>
@@ -123,97 +123,97 @@
          <translation>帳號</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="211"/>
+        <location filename="../src/gui/accountsettings.cpp" line="212"/>
          <source>Choose what to sync</source>
          <translation>選擇要同步的項目</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="218"/>
+        <location filename="../src/gui/accountsettings.cpp" line="220"/>
          <source>Remove folder sync connection</source>
          <translation>移除資料夾同步連線</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="284"/>
+        <location filename="../src/gui/accountsettings.cpp" line="286"/>
          <source>Folder creation failed</source>
          <translation>資料夾建立失敗</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="285"/>
+        <location filename="../src/gui/accountsettings.cpp" line="287"/>
          <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="332"/>
+        <location filename="../src/gui/accountsettings.cpp" line="334"/>
          <source>Confirm Folder Sync Connection Removal</source>
          <translation>確認移除資料夾同步連線</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="338"/>
+        <location filename="../src/gui/accountsettings.cpp" line="340"/>
          <source>Remove Folder Sync Connection</source>
          <translation>移除資料夾同步連線</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="421"/>
+        <location filename="../src/gui/accountsettings.cpp" line="423"/>
          <source>Sync Running</source>
          <translation>正在同步中</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="422"/>
+        <location filename="../src/gui/accountsettings.cpp" line="424"/>
          <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="490"/>
+        <location filename="../src/gui/accountsettings.cpp" line="492"/>
          <source>%1 in use</source>
          <translation>%1 正在使用</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="510"/>
+        <location filename="../src/gui/accountsettings.cpp" line="512"/>
          <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="514"/>
+        <location filename="../src/gui/accountsettings.cpp" line="516"/>
          <source>Connected to %1.</source>
          <translation>已連線到 %1</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="516"/>
+        <location filename="../src/gui/accountsettings.cpp" line="518"/>
          <source>Server %1 is temporarily unavailable.</source>
          <translation>伺服器 ％1 暫時無法使用。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="518"/>
+        <location filename="../src/gui/accountsettings.cpp" line="520"/>
          <source>Signed out from %1.</source>
          <translation>從 %1 登出</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="520"/>
+        <location filename="../src/gui/accountsettings.cpp" line="522"/>
          <source>No connection to %1 at %2.</source>
          <translation>沒有從 %2 連線到 %1</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="546"/>
+        <location filename="../src/gui/accountsettings.cpp" line="548"/>
          <source>Log in</source>
          <translation>登入</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="627"/>
+        <location filename="../src/gui/accountsettings.cpp" line="629"/>
          <source>There are new folders that were not synchronized because they are too big: </source>
          <translation>有部份的資料夾因為容量太大沒有辦法同步:</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="667"/>
+        <location filename="../src/gui/accountsettings.cpp" line="669"/>
          <source>Confirm Account Removal</source>
          <translation>確認移除帳號</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="668"/>
+        <location filename="../src/gui/accountsettings.cpp" line="670"/>
          <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="674"/>
+        <location filename="../src/gui/accountsettings.cpp" line="676"/>
          <source>Remove connection</source>
          <translation>移除連線</translation>
      </message>
@@ -224,42 +224,42 @@
      </message>
      <message>
          <location filename="../src/gui/accountsettings.cpp" line="141"/>
-        <location filename="../src/gui/accountsettings.cpp" line="544"/>
+        <location filename="../src/gui/accountsettings.cpp" line="546"/>
          <source>Log out</source>
          <translation>登出</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Resume sync</source>
          <translation>繼續同步</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="215"/>
+        <location filename="../src/gui/accountsettings.cpp" line="217"/>
          <source>Pause sync</source>
          <translation>暫停同步</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="333"/>
+        <location filename="../src/gui/accountsettings.cpp" line="335"/>
          <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="477"/>
+        <location filename="../src/gui/accountsettings.cpp" line="479"/>
          <source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
          <translation>%1 (%3%) 中的 %2 正在使用， 有些資料夾，包括網路掛載或分享資料夾，可能有不同的限制。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="478"/>
+        <location filename="../src/gui/accountsettings.cpp" line="480"/>
          <source>%1 of %2 in use</source>
          <translation>已使用 %2 中的 %1%</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="487"/>
+        <location filename="../src/gui/accountsettings.cpp" line="489"/>
          <source>Currently there is no storage usage information available.</source>
          <translation>目前無法查詢儲存空間使用資訊。</translation>
      </message>
      <message>
-        <location filename="../src/gui/accountsettings.cpp" line="526"/>
+        <location filename="../src/gui/accountsettings.cpp" line="528"/>
          <source>No %1 connection configured.</source>
          <translation>沒有 %1 連線設置。</translation>
      </message>
@@ -624,7 +624,7 @@ Please go in the settings to select it if you wish to download it.</source>
  如果您想要下載它的話，請至設定中選取。</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1179"/>
+        <location filename="../src/gui/folder.cpp" line="1183"/>
          <source>This sync would remove all the files in the sync folder '%1'.
  This might be because the folder was silently reconfigured, or that all the files were manually removed.
  Are you sure you want to perform this operation?</source>
@@ -633,39 +633,39 @@ Are you sure you want to perform this operation?</source>
  您確定要執行這項動作?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1183"/>
+        <location filename="../src/gui/folder.cpp" line="1187"/>
          <source>Remove All Files?</source>
          <translation>移除所有檔案?</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1185"/>
+        <location filename="../src/gui/folder.cpp" line="1189"/>
          <source>Remove all files</source>
          <translation>移除所有檔案</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1186"/>
+        <location filename="../src/gui/folder.cpp" line="1190"/>
          <source>Keep files</source>
          <translation>保留檔案</translation>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1204"/>
+        <location filename="../src/gui/folder.cpp" line="1208"/>
          <source>This sync would reset the files to an erlier time in the sync folder '%1'.
  This might be because a backup was restored on the server.
  Continuing the sync as normal will cause all your files to be overwritten by an older file in an earlier state. Do you want to keep your local most recent files as conflict files?</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1209"/>
+        <location filename="../src/gui/folder.cpp" line="1213"/>
          <source>Backup detected</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1211"/>
+        <location filename="../src/gui/folder.cpp" line="1215"/>
          <source>Normal Synchronisation</source>
          <translation type="unfinished"/>
      </message>
      <message>
-        <location filename="../src/gui/folder.cpp" line="1212"/>
+        <location filename="../src/gui/folder.cpp" line="1216"/>
          <source>Keep Local Files as Conflict</source>
          <translation type="unfinished"/>
      </message>
@@ -1075,7 +1075,7 @@ Total time left 12 minutes&quot;</extracomment>
          <translation>伺服器回應錯誤的內容長度</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="290"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="292"/>
          <source>Connection Timeout</source>
          <translation>連線逾時</translation>
      </message>
@@ -1842,37 +1842,37 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::PropagateDownloadFileQNAM</name>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="324"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="326"/>
          <source>File %1 can not be downloaded because of a local file name clash!</source>
          <translation>檔案 %1 無法被下載，因為本地端的檔案名稱已毀損!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="373"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="375"/>
          <source>The download would reduce free disk space below %1</source>
          <translation>這次下載將會減少硬碟空間: %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="378"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="380"/>
          <source>Free space on disk is less than %1</source>
          <translation>可用的硬碟空間已經少於 %1</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="493"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="495"/>
          <source>File was deleted from server</source>
          <translation>檔案已從伺服器被刪除</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="542"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="544"/>
          <source>The file could not be downloaded completely.</source>
          <translation>檔案下載無法完成。</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="646"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="648"/>
          <source>File %1 cannot be saved because of a local file name clash!</source>
          <translation>檔案 %1 無法存檔，因為本地端的檔案名稱已毀損!</translation>
      </message>
      <message>
-        <location filename="../src/libsync/propagatedownload.cpp" line="686"/>
+        <location filename="../src/libsync/propagatedownload.cpp" line="688"/>
          <source>File has changed since discovery</source>
          <translation>尋找的過程中檔案已經被更改</translation>
      </message>
@@ -2140,22 +2140,22 @@ It is not advisable to use it.</source>
  <context>
      <name>OCC::SelectiveSyncDialog</name>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="402"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="404"/>
          <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="416"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="418"/>
          <source>Choose What to Sync: Select remote subfolders you wish to synchronize.</source>
          <translation>請選擇要同步的內容: 您可以選擇想要同步的遠端子資料夾。</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="417"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="419"/>
          <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="423"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="425"/>
          <source>Choose What to Sync</source>
          <translation>選擇要同步的項目</translation>
      </message>
@@ -2178,15 +2178,15 @@ It is not advisable to use it.</source>
          <translation>大小</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="207"/>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="250"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="209"/>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
          <source>No subfolders currently on the server.</source>
          <translation>目前沒有子資料夾在伺服器上。</translation>
      </message>
      <message>
-        <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-        <source>An error occured while loading the list of sub folders.</source>
-        <translation>在讀取子資料夾清單中發生錯誤。</translation>
+        <location filename="../src/gui/selectivesyncdialog.cpp" line="254"/>
+        <source>An error occurred while loading the list of sub folders.</source>
+        <translation type="unfinished"/>
      </message>
  </context>
  <context>
@@ -2751,6 +2751,11 @@ It is not advisable to use it.</source>
          <source>Error while reading folder.</source>
          <translation>讀取資料夾時發生錯誤。</translation>
      </message>
+    <message>
+        <location filename="../src/libsync/syncengine.cpp" line="413"/>
+        <source>File/Folder is ignored because it&apos;s hidden.</source>
+        <translation type="unfinished"/>
+    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="668"/>
          <source>Only %1 are available, need at least %2 to start</source>
@@ -2842,11 +2847,6 @@ It is not advisable to use it.</source>
          <source>Filename is too long.</source>
          <translation>檔案名稱太長了。</translation>
      </message>
-    <message>
-        <location filename="../src/libsync/syncengine.cpp" line="413"/>
-        <source>File is ignored because it&apos;s hidden.</source>
-        <translation>這個檔案被忽略了，因為他是隱藏檔。</translation>
-    </message>
      <message>
          <location filename="../src/libsync/syncengine.cpp" line="419"/>
          <source>Stat failed.</source>
author	Jenkins for ownCloud <owncloud-bot@tmit.eu>
	Mon, 29 Feb 2016 17:10:28 +0000 (12:10 -0500)
committer	Jenkins for ownCloud <owncloud-bot@tmit.eu>
	Mon, 29 Feb 2016 17:10:28 +0000 (12:10 -0500)
translations/client_ca.ts		patch \| blob \| history
translations/client_cs.ts		patch \| blob \| history
translations/client_de.ts		patch \| blob \| history
translations/client_el.ts		patch \| blob \| history
translations/client_en.ts		patch \| blob \| history
translations/client_es.ts		patch \| blob \| history
translations/client_es_AR.ts		patch \| blob \| history
translations/client_et.ts		patch \| blob \| history
translations/client_eu.ts		patch \| blob \| history
translations/client_fa.ts		patch \| blob \| history
translations/client_fi.ts		patch \| blob \| history
translations/client_fr.ts		patch \| blob \| history
translations/client_gl.ts		patch \| blob \| history
translations/client_hu.ts		patch \| blob \| history
translations/client_it.ts		patch \| blob \| history
translations/client_ja.ts		patch \| blob \| history
translations/client_nb_NO.ts		patch \| blob \| history
translations/client_nl.ts		patch \| blob \| history
translations/client_pl.ts		patch \| blob \| history
translations/client_pt.ts		patch \| blob \| history
translations/client_pt_BR.ts		patch \| blob \| history
translations/client_ru.ts		patch \| blob \| history
translations/client_sk.ts		patch \| blob \| history
translations/client_sl.ts		patch \| blob \| history
translations/client_sr.ts		patch \| blob \| history
translations/client_sv.ts		patch \| blob \| history
translations/client_th.ts		patch \| blob \| history
translations/client_tr.ts		patch \| blob \| history
translations/client_uk.ts		patch \| blob \| history
translations/client_zh_CN.ts		patch \| blob \| history
translations/client_zh_TW.ts		patch \| blob \| history