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

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins for ownCloud <owncloud-bot@tmit.eu>2016-05-04 09:19:15 +0300
committerJenkins for ownCloud <owncloud-bot@tmit.eu>2016-05-04 09:19:15 +0300
commit15dc3408ef19c3a0f030a76c21793c5b0acefb1c (patch)
treec588c28d0166ac21e68161e56c606c924cac57ca /translations
parent928643f597782e1ff0b63761062a1687ab37494f (diff)
[tx-robot] updated from transifex
Diffstat (limited to 'translations')
-rw-r--r--translations/client_ca.ts170
-rw-r--r--translations/client_cs.ts118
-rw-r--r--translations/client_de.ts118
-rw-r--r--translations/client_el.ts118
-rw-r--r--translations/client_en.ts118
-rw-r--r--translations/client_es.ts118
-rw-r--r--translations/client_es_AR.ts118
-rw-r--r--translations/client_et.ts118
-rw-r--r--translations/client_eu.ts118
-rw-r--r--translations/client_fa.ts118
-rw-r--r--translations/client_fi.ts118
-rw-r--r--translations/client_fr.ts118
-rw-r--r--translations/client_gl.ts118
-rw-r--r--translations/client_hu.ts118
-rw-r--r--translations/client_it.ts118
-rw-r--r--translations/client_ja.ts188
-rw-r--r--translations/client_nb_NO.ts118
-rw-r--r--translations/client_nl.ts118
-rw-r--r--translations/client_pl.ts118
-rw-r--r--translations/client_pt.ts118
-rw-r--r--translations/client_pt_BR.ts118
-rw-r--r--translations/client_ru.ts118
-rw-r--r--translations/client_sk.ts118
-rw-r--r--translations/client_sl.ts118
-rw-r--r--translations/client_sr.ts118
-rw-r--r--translations/client_sv.ts118
-rw-r--r--translations/client_th.ts118
-rw-r--r--translations/client_tr.ts118
-rw-r--r--translations/client_uk.ts118
-rw-r--r--translations/client_zh_CN.ts118
-rw-r--r--translations/client_zh_TW.ts118
31 files changed, 1890 insertions, 1890 deletions
diff --git a/translations/client_ca.ts b/translations/client_ca.ts
index c2d5935d3..9705164b6 100644
--- a/translations/client_ca.ts
+++ b/translations/client_ca.ts
@@ -68,12 +68,12 @@
<message>
<location filename="../src/gui/notificationwidget.ui" line="56"/>
<source>Lorem ipsum dolor sit amet</source>
- <translation type="unfinished"/>
+ <translation>Lorem ipsum dolor sit amet</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.ui" line="69"/>
<source>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </source>
- <translation type="unfinished"/>
+ <translation>Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod temporm </translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.ui" line="89"/>
@@ -148,7 +148,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="223"/>
<source>Remove folder sync connection</source>
- <translation type="unfinished"/>
+ <translation>Elimina la connexió de la carpeta sincronitzada</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="288"/>
@@ -163,12 +163,12 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="339"/>
<source>Confirm Folder Sync Connection Removal</source>
- <translation type="unfinished"/>
+ <translation>Confirma l&apos;eliminació de la connexió de la carpeta sincronitzada</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Remove Folder Sync Connection</source>
- <translation type="unfinished"/>
+ <translation>Elimina la connexió de la carpeta sincronitzada</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="427"/>
@@ -183,7 +183,7 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="495"/>
<source>%1 in use</source>
- <translation type="unfinished"/>
+ <translation>%1 en ús</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="515"/>
@@ -223,12 +223,12 @@
<message>
<location filename="../src/gui/accountsettings.cpp" line="636"/>
<source>There are new folders that were not synchronized because they are too big: </source>
- <translation type="unfinished"/>
+ <translation>Hi ha carpetes noves que no s&apos;han sincronitzat perquè són massa grans:</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="676"/>
<source>Confirm Account Removal</source>
- <translation type="unfinished"/>
+ <translation>Confirmeu l&apos;eliminació del compte</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="677"/>
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>S&apos;ha desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Desconnectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Connectat</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Servei no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Error de xarxa</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Error de configuració</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Estat del compte desconegut</translation>
</message>
@@ -375,7 +375,7 @@
<location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
- <translation type="unfinished"/>
+ <translation>No sincronitzat (%1)</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="596"/>
@@ -430,32 +430,32 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="139"/>
<source>Action Required: Notifications</source>
- <translation type="unfinished"/>
+ <translation>Es requereix una acció: Notificacions</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="144"/>
<source>&lt;br/&gt;Account %1 does not have activities enabled.</source>
- <translation type="unfinished"/>
+ <translation>&lt;br/&gt;El compte %1 no té les activitats habilitades.</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="351"/>
<source>You received %n new notification(s) from %2.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>Heu rebut %n nova notificació de %2.</numerusform><numerusform>Heu rebut %n noves notificacions de %2.</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="359"/>
<source>You received %n new notification(s) from %1 and %2.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>Heu rebut %n nova notificació de %1 i %2.</numerusform><numerusform>Heu rebut %n noves notificacions de %1 i %2.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="361"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
- <translation type="unfinished"/>
+ <translation>Heu rebut noves notificacions de %1, %2 i altres comptes.</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>%1 Notifications - Action Required</source>
- <translation type="unfinished"/>
+ <translation>%1 notificacions - Es requereix una acció</translation>
</message>
</context>
<context>
@@ -524,7 +524,7 @@
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Error en escriure les metadades a la base de dades</translation>
</message>
</context>
<context>
@@ -579,158 +579,158 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>El fitxer local %1 no existeix.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>No es pot llegir %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>S&apos;ha esborrat &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>S&apos;ha descarregat %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>S&apos;ha actualitzat %1</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 s&apos;ha reanomenat a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 s&apos;ha mogut a %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no s&apos;ha pogut sincronitzar degut a un error. Mireu el registre per més detalls.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Activitat de sincronització</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>No s&apos;ha pogut llegir el fitxer d&apos;exclusió del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>S&apos;ha afegit una carpeta nova de més de %1 MB: %2.
Aneu a arranjament per seleccionar-la si voleu descarregar-la.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Esborra tots els fitxers?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Esborra tots els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Mantén els fitxers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -738,112 +738,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>No es pot restablir l&apos;estat de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>S&apos;ha trobat un diari de sincronització antic &apos;%1&apos;, però no s&apos;ha pogut eliminar. Assegureu-vos que no hi ha cap aplicació que actualment en faci ús.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(copia de seguretat)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(copia de seguretat %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Estat indefinit.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>S&apos;està esperant per començar a sincronitzar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>S&apos;està preparant per la sincronització.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>S&apos;està sincronitzant.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>La darrera sincronització va ser correcta.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronització ha estat un èxit, però amb avisos en fitxers individuals.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Error de configuració.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Cancel·la usuari.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>La sincronització està en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sync està pausat)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>No s&apos;ha seleccionat cap directori vàlid!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>No teniu permisos per escriure en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -913,13 +913,13 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<location filename="../src/gui/folderstatusmodel.cpp" line="867"/>
<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="870"/>
<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="895"/>
@@ -971,7 +971,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
- <translation type="unfinished"/>
+ <translation>%5 pendent, %1 de %2, fitxer %3 de %4</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
@@ -1916,7 +1916,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Error en escriure les metadades a la base de dades</translation>
</message>
</context>
<context>
@@ -1964,7 +1964,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Error en escriure les metadades a la base de dades</translation>
</message>
</context>
<context>
@@ -2005,7 +2005,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Error en escriure les metadades a la base de dades</translation>
</message>
</context>
<context>
@@ -2036,7 +2036,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Error en escriure les metadades a la base de dades</translation>
</message>
</context>
<context>
@@ -2062,7 +2062,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Error en escriure les metadades a la base de dades</translation>
</message>
</context>
<context>
@@ -2090,7 +2090,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Error en escriure les metadades a la base de dades</translation>
</message>
</context>
<context>
@@ -2139,7 +2139,7 @@ No és aconsellada usar-la.</translation>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="782"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>Error en escriure les metadades a la base de dades</translation>
</message>
</context>
<context>
@@ -2559,7 +2559,7 @@ No és aconsellada usar-la.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Comparteix amb %1</translation>
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 77d9eebd0..bb039db8d 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Odhlášeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Odpojeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Připojeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Služba nedostupná</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Chyba sítě</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Chyba konfigurace</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Neznámý stav účtu</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Místní složka %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 by měl být adresář, ale není.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 není čitelný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl odebrán.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl stažen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 byl aktualizován.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 byl přejmenován na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 byl přemístěn do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 soubor bude smazán.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform><numerusform>%1 a %n další soubory budou smazány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 soubor byl stažen.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform><numerusform>%1 a %n další soubory byly staženy.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 soubor byl aktualizován.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform><numerusform>%1 a %n další soubory byly aktualizovány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 byl přejmenován na %2.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform><numerusform>%1 byl přejmenován na %2 a %n další soubory byly přejmenovány.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 byl přesunut do %2.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform><numerusform>%1 byl přesunut do %2 a %n dalších souborů bylo přesunuto.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform><numerusform>%1 a %n dalších souborů má problém se synchronizací.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 má problém se synchronizací. Prosím zkontrolujte chybový soubor.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 soubor nemůže být synchronizován kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform><numerusform>%1 a %n dalších souborů nemohou být synchronizovány kvůli chybám. Shlédněte log pro detaily.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nebyl kvůli chybě synchronizován. Detaily jsou k nalezení v logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Průběh synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Nezdařilo se přečtení systémového exclude souboru</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Byl přidán nový adresář %2 větší než %1 MB.
Pokud ho chcete stáhnout, přejděte prosím do nastavení a označte ho.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Odstranit všechny soubory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Odstranit všechny soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Ponechat soubory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Záloha nalezena</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Normální synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Ponechat místní soubory jako konflikt</translation>
</message>
@@ -742,112 +742,112 @@ Pokračováním v synchronizaci způsobí přepsání všech vašich souborů st
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Nelze obnovit stav složky</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Byl nalezen starý záznam synchronizace &apos;%1&apos;, ale nebylo možné jej odebrat. Ujistěte se, že není aktuálně používán jinou aplikací.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation> (záloha)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation> (záloha %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Čeká na spuštění synchronizace.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Příprava na synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Synchronizace probíhá.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Poslední synchronizace byla úspěšná.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Poslední synchronizace byla úspěšná, ale s varováním u některých souborů</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Chyba nastavení.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Zrušení uživatelem.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Synchronizace pozastavena.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizace je pozastavena)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Nebyl vybrán platný adresář!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Vybraná cesta nevede do adresáře!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nemáte oprávnění pro zápis do zvolené složky!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 je již použit pro synchronizaci odesílání. Zvolte prosím jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 již obsahuje podadresář použitý pro synchronizaci odesílání. Zvolte prosím jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 je symbolickým obsahem. Cíl odkazu již obsahuje adresář použitý pro synchronizaci adresáře. Vyberte, prosím, jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 je již obsažen ve složce použité pro synchronizaci. Vyberte, prosím, jiný!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Místní adresář %1 je symbolickým obsahem. Cíl odkazu je již obsažen v adresáři použitém pro synchronizaci. Vyberte, prosím, jiný!</translation>
</message>
@@ -2563,7 +2563,7 @@ Nedoporučuje se jí používat.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Sdílet s %1</translation>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index 22bcb0f6d..449c3f62b 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Abgemeldet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Getrennt</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Verbunden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Dienst nicht verfügbar</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Netzwerkfehler</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Konfigurationsfehler</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Unbekannten Konto-Zustand</translation>
</message>
@@ -579,118 +579,118 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokales Verzeichnis %1 existiert nicht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 sollte ein Ordner sein, ist es aber nicht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 ist nicht lesbar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde gelöscht.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde heruntergeladen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 wurde aktualisiert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 wurde in %2 umbenannt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 wurde in %2 verschoben.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 und %n andere Datei wurde gelöscht.</numerusform><numerusform>%1 und %n andere Dateien wurden gelöscht.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 und %n andere Datei wurde heruntergeladen.</numerusform><numerusform>%1 und %n andere Dateien wurden heruntergeladen.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 und %n andere Datei wurde aktualisiert.</numerusform><numerusform>%1 und %n andere Dateien wurden aktualisiert.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 wurde in %2 umbenannt und %n andere Datei wurde umbenannt.</numerusform><numerusform>%1 wurde in %2 umbenannt und %n andere Dateien wurden umbenannt.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 wurde in %2 verschoben und %n andere Datei wurde verschoben.</numerusform><numerusform>%1 wurde in %2 verschoben und %n andere Dateien wurden verschoben.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 und %n andere Datei haben Konflikte beim Abgleichen.</numerusform><numerusform>%1 und %n andere Dateien haben Konflikte beim Abgleichen.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>Es gab einen Konflikt bei der Synchronisierung von %1. Bitte prüfen Sie die Konfliktdatei!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 und %n weitere Datei konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform><numerusform>%1 und %n weitere Dateien konnten aufgrund von Fehlern nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 konnte aufgrund eines Fehlers nicht synchronisiert werden. Schauen Sie in das Protokoll für Details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Synchronisierungsaktivität</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Systemeigene Ausschlussdatei kann nicht gelesen werden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Ein neue Order größer als %1 MB wurde hinzugefügt: %2. Bitte besuchen Sie die Einstellungen, falls sie ihn herunterladen wollen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -699,22 +699,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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Alle Dateien löschen?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Lösche alle Dateien</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Dateien behalten</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -723,17 +723,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Backup erkannt</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Normale Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Lokale Konfliktdateien behalten</translation>
</message>
@@ -741,112 +741,112 @@ Wenn diese Synchronisation fortgesetzt wird, werden Dateien eventuell von älter
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Konnte Ordner-Zustand nicht zurücksetzen</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Ein altes Synchronisations-Journal &apos;%1&apos; wurde gefunden, konnte jedoch nicht entfernt werden. Bitte stellen Sie sicher, dass keine Anwendung es verwendet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(Sicherung)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(Sicherung %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Undefinierter Zustand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Wartet auf Beginn der Synchronistation</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Synchronisation wird vorbereitet.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Synchronisation läuft.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Die letzte Synchronisation war erfolgreich.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Letzte Synchronisation war erfolgreich, aber mit Warnungen für einzelne Dateien.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Installationsfehler.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Benutzer-Abbruch</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Synchronisation wurde angehalten.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation ist pausiert)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Kein gültige Ordner gewählt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Der gewählte Pfad ist kein Ordner!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sie haben keine Schreibberechtigung für den ausgewählten Ordner!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 wird bereits als Synchronisationsordner benutzt. Bitte wählen Sie einen anderen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 liegt innerhalb eines synchronisierten Ordners. Bitte wählen Sie einen anderen aus!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 ist ein symbolischer Link. Das Ziel des Links beinhaltet schon einen Ordner, der in einer anderen Synchronisation liegt. Bitte wählen Sie einen anderen lokalen Ordner aus!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 liegt in einem Ordner, der bereits synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Der lokale Ordner %1 ist ein symbolischer Link. Das Ziel des Links liegt in einem Ordner, der schon synchronisiert wird. Bitte wählen Sie einen anderen aus!</translation>
</message>
@@ -2561,7 +2561,7 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Via %1 teilen</translation>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index d057ca66a..71e1236b7 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Αποσυνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Συνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Η υπηρεσία δεν είναι διαθέσιμη</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Σφάλμα δικτύου</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Σφάλμα ρυθμίσεων</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Άγνωστη κατάσταση λογαριασμού</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Δεν υπάρχει ο τοπικός φάκελος %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>Το %1 θα έπρεπε να είναι φάκελος αλλά δεν είναι.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation> Το %1 δεν είναι αναγνώσιμο. </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 αφαιρέθηκε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ληφθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Το %1 έχει ενημερωθεί.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Το %1 έχει μετονομαστεί σε %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>Το %1 έχει μετακινηθεί στο %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 δεν ήταν δυνατό να συγχρονιστεί εξαιτίας ενός σφάλματος. Δείτε το αρχείο καταγραφής για λεπτομέρειες.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Δραστηριότητα Συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Αδυναμία ανάγνωσης αρχείου αποκλεισμού συστήματος</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Ένας νέος φάκελος μεγαλύτερος από %1 MB έχει προστεθεί: %2.
Παρακαλούμε πηγαίνετε στις ρυθμίσεις για να επιλέξετε αν επιθυμείτε να τον κατεβάσετε.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,39 +700,39 @@ Are you sure you want to perform this operation?</source>
Είστε σίγουροι ότι θέλετε να εκτελέσετε αυτή τη λειτουργία;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Αφαίρεση Όλων των Αρχείων;</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Αφαίρεση όλων των αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Διατήρηση αρχείων</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -740,112 +740,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Δεν ήταν δυνατό να επαναφερθεί η κατάσταση του φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Βρέθηκε ένα παλαιότερο αρχείο συγχρονισμού &apos;%1&apos;, αλλά δεν μπόρεσε να αφαιρεθεί. Παρακαλώ βεβαιωθείτε ότι καμμία εφαρμογή δεν το χρησιμοποιεί αυτή τη στιγμή.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(αντίγραφο ασφαλείας)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(αντίγραοφ ασφαλέιας %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Απροσδιόριστη Κατάσταση.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Αναμονή έναρξης συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Προετοιμασία για συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Ο συγχρονισμός εκτελείται.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ο τελευταίος συγχρονισμός ήταν επιτυχής, αλλά υπήρχαν προειδοποιήσεις σε συγκεκριμένα αρχεία.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Σφάλμα Ρύθμισης.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Ματαίωση από Χρήστη.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Παύση συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Παύση συγχρονισμού)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Δεν επιλέχθηκε έγκυρος φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Η επιλεγμένη διαδρομή δεν είναι φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Δεν έχετε δικαιώματα εγγραφής στον επιλεγμένο φάκελο!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 χρησιμοποιείται ήδη σε μια σύνδεση συγχρονισμού φακέλου. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 περιέχει ήδη ένα φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού φακέλου. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 είναι συμβολικός σύνδεσμος. Ο σύνδεσμος που παραπέμπει περιέχει ήδη ένα φάκελο που βρίσκεται σε συγχρονισμό. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 περιέχεται ήδη σε φάκελο που χρησιμοποιείται σε μια σύνδεση συγχρονισμού. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Ο τοπικός φάκελος %1 είναι συμβολικός σύνδεσμος. Ο σύνδεσμος που παραπέμπει περιέχεται ήδη σε φάκελο που βρίσκεται σε συγχρονισμό. Παρακαλώ επιλέξτε άλλον!</translation>
</message>
@@ -2561,7 +2561,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Διαμοιρασμός με %1</translation>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 382cfce97..86f55da4f 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -292,37 +292,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation type="unfinished"></translation>
</message>
@@ -587,57 +587,57 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -645,7 +645,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -653,7 +653,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -661,7 +661,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -669,7 +669,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -677,7 +677,7 @@
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -685,12 +685,12 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished">
<numerusform></numerusform>
@@ -698,67 +698,67 @@
</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"></translation>
</message>
@@ -766,112 +766,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"></translation>
</message>
@@ -2582,7 +2582,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation type="unfinished"></translation>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index dab3bd837..aee506b26 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Error en la red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Error en la configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Estado de cuenta desconocido</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>La carpeta local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 debería ser un directorio, pero no lo es.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 es ilegible.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ha sido renombrado a %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ha sido movido a %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 y otro archivo han sido borrados.</numerusform><numerusform>%1 y otros %n archivos han sido borrados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 y otro archivo han sido descargados.</numerusform><numerusform>%1 y otros %n archivos han sido descargados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 y otro archivo han sido actualizados.</numerusform><numerusform>%1 y otros %n archivos han sido actualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 ha sido renombrado a %2 y otro archivo ha sido renombrado.</numerusform><numerusform>%1 ha sido renombrado a %2 y otros %n archivos han sido renombrado.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 ha sido movido a %2 y otro archivo ha sido movido.</numerusform><numerusform>%1 ha sido movido a %2 y otros %n archivos han sido movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 y otro archivo han tenido conflictos al sincronizar.</numerusform><numerusform>%1 y otros %n archivos han tenido conflictos al sincronizar.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>Conflicto al sincronizar %1. Por favor compruebe el archivo!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 y otro archivo no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform><numerusform>%1 y otros %n archivos no pudieron ser sincronizados debido a errores. Para más detalles vea el registro.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 no pudo ser sincronizado debido a un error. Para más detalles, vea el registro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Actividad de la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>No se ha podido leer el archivo de exclusión del sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Se ha añadido una nueva carpeta más grande de %1 MB: %2.
Por favor diríjase a los ajustes para seleccionarlo si desea descargarlo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,22 @@ 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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>¿Eliminar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Eliminar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,17 @@ 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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Sincronización Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantener los archivos locales en caso de conflicto</translation>
</message>
@@ -742,112 +742,112 @@ Continuar con la sincronización hará que todos los archivos sean sobreescritos
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>No se ha podido restablecer el estado de la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Se ha encontrado un antiguo registro de sincronización &apos;%1&apos;; pero no se ha podido eliminar. Por favor, asegúrese de que ninguna aplicación la esté utilizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(copia de seguridad)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(copia de seguridad %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Esperando para comenzar la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Preparándose para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización se ha realizado con éxito.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La última sincronización salió bien; pero hay advertencias para archivos individuales.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Interrumpido por el usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>¡La carpeta seleccionada no es válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>¡La ruta seleccionada no es un directorio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡Usted no tiene permiso para escribir en la carpeta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 ya se usa en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 ya contiene un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 es un enlace simbólico. El objetivo del enlace ya contiene un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 está dentro de un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>El directorio local %1 es un enlace simbólico. El objetivo está incluido en un directorio usado en una conexión de sincronización de directorios. Por favor, elija otro.</translation>
</message>
@@ -2562,7 +2562,7 @@ No se recomienda usarla.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Compartir con %1</translation>
diff --git a/translations/client_es_AR.ts b/translations/client_es_AR.ts
index d0e0551eb..9e7860ded 100644
--- a/translations/client_es_AR.ts
+++ b/translations/client_es_AR.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Desautentificado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Servicio no disponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Error de red</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Error de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Estado de la cuenta desconocido</translation>
</message>
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>El directorio local %1 no existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 debé ser una carpeta pero no lo es.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>No se puede leer %1.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido eliminado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido descargado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ha sido actualizado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Actividad de Sync</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>¿Borrar todos los archivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Borrar todos los archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Conservar archivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>No se pudo </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Una antigua sincronización con journaling &apos;%1&apos; fue encontrada, pero no se pudo eliminar. Por favor, asegurate que ninguna aplicación la está utilizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Estado no definido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Preparando la sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Sincronización en funcionamiento.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>La última sincronización fue exitosa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>El último Sync fue exitoso, pero hubo advertencias en archivos individuales.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Error de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Interrumpir.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>La sincronización está en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>¡No tenés permisos para escribir el directorio seleccionado!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2550,7 +2550,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation type="unfinished"/>
diff --git a/translations/client_et.ts b/translations/client_et.ts
index d021a0704..3f560f352 100644
--- a/translations/client_et.ts
+++ b/translations/client_et.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Välja logitud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Lahti ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Ühendatud</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Teenus pole saadaval</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Võrgu viga</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Seadistamise tõrge</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Tundmatu konto olek</translation>
</message>
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Kohalikku kausta %1 pole olemas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 pole loetav.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on eemaldatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on alla laaditud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on uuendatud.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on ümber nimetatud %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on tõstetud %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 sünkroniseerimine ebaõnnestus tõrke tõttu. Lisainfot vaata logist.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Sünkroniseerimise tegevus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Süsteemi väljajätmiste faili lugemine ebaõnnestus</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Kustutada kõik failid?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Kustutada kõik failid</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Säilita failid</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Leiti varukoopia</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Tavaline sünkroonimine</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Ei suutnud tühistada kataloogi staatust</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Leiti vana sünkroniseeringu zurnaal &apos;%1&apos;, kuid selle eemaldamine ebaõnnenstus. Palun veendu, et seda kasutaks ükski programm.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(varukoopia)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation> (varukoopia %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Määramata staatus.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Oodatakse sünkroonimise alustamist.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Valmistun sünkroniseerima.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Sünkroniseerimine on käimas.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Viimane sünkroniseerimine oli edukas.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimane sünkroniseering oli edukas, kuid mõned failid põhjustasid tõrkeid.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Seadistamise viga.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Kasutaja tühistamine.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Sünkroniseerimine on peatatud.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sünkroniseerimine on peatatud)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Sobilikku kausta pole valitud!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Valitud asukoht pole kaust!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sul puuduvad õigused valitud kataloogi kirjutamiseks!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2551,7 +2551,7 @@ Selle kasutamine pole soovitatav.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Jagatud kasutajaga %1</translation>
diff --git a/translations/client_eu.ts b/translations/client_eu.ts
index f056fbf7d..5ec6e97f5 100644
--- a/translations/client_eu.ts
+++ b/translations/client_eu.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Saioa bukatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Deskonektatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Konektatuta</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Zerbitzua ez dago eskuragarri</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Sare errorea</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Konfigurazio errorea</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Kontuaren egoera ezezaguna</translation>
</message>
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Bertako %1 karpeta ez da existitzen.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 karpeta bat izan behar zen baina ez da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 ezin da irakurri.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ezabatua izan da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 deskargatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 kargatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 %2-(e)ra berrizendatu da.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 %2-(e)ra mugitu da.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 ezin izan da sinkronizatu akats bat dela eta. Ikusi egunerkoa zehaztapen gehiago izateko.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Sinkronizazio Jarduerak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Ezin izan da sistemako baztertutakoen fitxategia irakurri</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Ezabatu Fitxategi Guztiak?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Ezabatu fitxategi guztiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Mantendu fitxategiak</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Ezin izan da karpetaren egoera berrezarri</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Aurkitu da &apos;%1&apos; sinkronizazio erregistro zaharra, baina ezin da ezabatu. Ziurtatu aplikaziorik ez dela erabiltzen ari.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Definitu gabeko egoera.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Itxoiten sinkronizazioa hasteko.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Sinkronizazioa prestatzen.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Sinkronizazioa martxan da.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Azkeneko sinkronizazioa ongi burutu zen.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Azkenengo sinkronizazioa ongi burutu zen, baina banakako fitxategi batzuetan abisuak egon dira.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Konfigurazio errorea.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Erabiltzaileak bertan behera utzi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Sinkronizazioa pausatuta dago.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Sinkronizazioa pausatuta dago)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Ez da karpeta egokirik hautatu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Hautatutako bidea ez da karpeta bat!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Ez daukazu hautatutako karpetan idazteko baimenik!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2557,7 +2557,7 @@ Ez da gomendagarria erabltzea.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation type="unfinished"/>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index 0e243cd32..5a044afa3 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>خارج شد</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>متصل</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>سرویس خارج از دسترس</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>خطای شبکه</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation type="unfinished"/>
</message>
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>پوشه محلی %1 موجود نیست.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 قابل خواندن نیست.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 حذف شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 بارگزاری شد.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 بروز رسانی شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 به %2 تغییر نام داده شده است.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 به %2 انتقال داده شده است.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>فعالیت همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>حذف تمام فایل ها؟</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>حذف تمام فایل ها</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>نگه داشتن فایل ها</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>نمی تواند حالت پوشه را تنظیم مجدد کند</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation> (پشتیبان %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>موقعیت تعریف نشده</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>آماده سازی برای همگام سازی کردن.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>آخرین همگام سازی موفقیت آمیز بود</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>خطا در پیکر بندی.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>خارج کردن کاربر.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>همگام سازی فعلا متوقف شده است</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (همگام‌سازی موقتا متوقف شده است)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>هیچ پوشه‌ی معتبری انتخاب نشده است!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>شما اجازه نوشتن در پوشه های انتخاب شده را ندارید!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2550,7 +2550,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>اشتراک‌گذاری با %1</translation>
diff --git a/translations/client_fi.ts b/translations/client_fi.ts
index 5d7c9a5d2..f78939ceb 100644
--- a/translations/client_fi.ts
+++ b/translations/client_fi.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Kirjauduttu ulos</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Yhteys katkaistu</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Yhdistetty</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Palvelu ei ole käytettävissä</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Verkkovirhe</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Asetusvirhe</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Tuntematon tilin tila</translation>
</message>
@@ -579,158 +579,158 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Paikallista kansiota %1 ei ole olemassa.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>Kohteen %1 pitäisi olla kansio, mutta se ei kuitenkaan ole kansio.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 ei ole luettavissa.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 on poistettu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 on ladattu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 on päivitetty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 on nimetty uudeelleen muotoon %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 on siirretty kohteeseen %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Kohdetta %1 ei voi synkronoida virheen vuoksi. Katso tarkemmat tiedot lokista.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Synkronointiaktiviteetti</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Uusi kansio, joka on suurempi kuin %1 Mt, on lisätty: %2.
Siirry asetuksiin valitaksesi sen, jos haluat ladata kyseisen kansion.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Poistetaanko kaikki tiedostot?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Poista kaikki tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Säilytä tiedostot</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Varmuuskopio poistettu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Normaali synkronointi</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -738,112 +738,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Kansion tilaa ei voitu alustaa</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation> (varmuuskopio)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation> (varmuuskopio %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Määrittelemätön tila.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Odotetaan synkronoinnin aloitusta.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Valmistellaan synkronointia.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Synkronointi on meneillään.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Viimeisin synkronointi suoritettiin onnistuneesti.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Viimeisin synkronointi onnistui, mutta yksittäisten tiedostojen kanssa ilmeni varoituksia.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Asetusvirhe.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Synkronointi on keskeytetty.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronointi on keskeytetty)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Kelvollista kansiota ei ole valittu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Valittu polku ei ole kansio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Sinulla ei ole kirjoitusoikeutta valittuun kansioon!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Paikallinen kansio %1 on jo käytössä kansion synkronointiyhteydessä. Valitse toinen kansio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Paikallinen kansio %1 sisältää kansion, jota käytetään kansion synkronointiyhteydessä. Valitse toinen kansio!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2558,7 +2558,7 @@ Osoitteen käyttäminen ei ole suositeltavaa.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation type="unfinished"/>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 876655c7b..9495fed72 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Session fermée</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Déconnecté</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Connecté</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Service indisponible</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Erreur réseau</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Erreur de configuration</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Etat du compte inconnu</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Le dossier local %1 n&apos;existe pas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 devrait être un dossier mais ne l&apos;est pas.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 ne peut pas être lu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été supprimé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été téléchargé.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 a été mis à jour.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 a été renommé en %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 a été déplacé vers %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 n&apos;a pu être synchronisé pour cause d&apos;erreur. Consultez les logs pour les détails.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Activité de synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Impossible de lire le fichier d&apos;exclusion du système</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Un nouveau dossier de taille supérieure à %1 Mo a été ajouté : %2.
Veuillez le sélectionner dans la fenêtre des paramètres pour le télécharger.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Supprimer tous les fichiers ?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Supprimer tous les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Garder les fichiers</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Sauvegarde détecté</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Synchronisation normale</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Garder les fichiers locaux comme Conflits</translation>
</message>
@@ -742,112 +742,112 @@ Continuer la synchronisation comme d&apos;habitude fera en sorte que tous les fi
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Impossible de réinitialiser l&apos;état du dossier</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Un ancien fichier journal &apos;%1&apos; a été trouvé, mais ne peut être supprimé. Veuillez vous assurer qu’aucune application ne l&apos;utilise en ce moment.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(sauvegarde)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(sauvegarde %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Statut indéfini.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>En attente de synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Préparation de la synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>La synchronisation est en cours.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Dernière synchronisation effectuée avec succès</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>La dernière synchronisation s&apos;est achevée avec succès mais avec des avertissement à propos de certains fichiers.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Erreur d&apos;installation.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Abandon par l&apos;utilisateur.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>La synchronisation est en pause.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisation en pause)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Aucun dossier valable sélectionné !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Le chemin sélectionné n&apos;est pas un dossier !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Vous n&apos;avez pas la permission d&apos;écrire dans le dossier sélectionné !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 est déjà utilisé pour une synchronisation de dossiers. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 contient un dossier déjà utilisé pour une synchronisation de dossiers. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 est un lien symbolique. Le dossier vers lequel le lien pointe contient un dossier déjà utilisé pour une synchronisation de dossier. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 se trouve dans un dossier déjà configuré pour une synchronisation de dossier. Veuillez en choisir un autre !</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Le dossier local %1 est un lien symbolique. Le dossier vers lequel le lien pointe est inclus dans un dossier déjà configuré pour une synchronisation de dossier. Veuillez en choisir un autre !</translation>
</message>
@@ -2563,7 +2563,7 @@ Il est déconseillé de l&apos;utiliser.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Partager avec %1</translation>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index c6a0031b8..5fe27b83e 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Servizo non dispoñíbel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Produciuse un erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Produciuse un erro de configuración</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Estado da conta descoñecido</translation>
</message>
@@ -579,158 +579,158 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>O cartafol local %1 non existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 non é lexíbel.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi retirado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descargado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi enviado satisfactoriamente.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado satisfactoriamente a %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido satisfactoriamente a %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 non puido sincronizarse por mor dun erro. Vexa os detalles no rexistro.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Actividade de sincronización</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Non foi posíbel ler o ficheiro de exclusión do sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Foi engadido un novo cartafol maior de %1 MB: %2.
Vaia aos axustes e seleccióneo se quere descargalo.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Retirar todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Retirar todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -738,112 +738,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Non foi posíbel restabelecer o estado do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Atopouse un rexistro de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningunha aplicación.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(copia de seguranza)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(copia de seguranza %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Estado sen definir.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Estase sincronizando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>A última sincronización fíxose correctamente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronización fíxose correctamente, mais con algún aviso en ficheiros individuais.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Erro de configuración.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Interrompido polo usuario.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Sincronización en pausa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (sincronización en pausa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Non seleccionou ningún cartafol correcto!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Vostede non ten permiso para escribir neste cartafol!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2557,7 +2557,7 @@ Recomendámoslle que non o use.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Compartir con %1</translation>
diff --git a/translations/client_hu.ts b/translations/client_hu.ts
index afbf792cd..bfa04f3fc 100644
--- a/translations/client_hu.ts
+++ b/translations/client_hu.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Kijelentkezve</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Szétcsatlakozva</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Csatlakozva</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Szolgáltatás nem érhető el</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Hálózati hiba</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Beállítási hiba</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Ismeretlen fiók állapot</translation>
</message>
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 helyi mappa nem létezik.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 valószínűleg könyvtár, de nem az.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 nem olvasható.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen törölve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen letöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 sikeresen feltöltve.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 átnevezve erre: %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 áthelyezve ide: %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 és %n további fájl törölve.</numerusform><numerusform>%1 és %n további fájl törölve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 és %n további fájl letöltve.</numerusform><numerusform>%1 és %n további fájl letöltve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 és %n további fájl feltöltve.</numerusform><numerusform>%1 és %n további fájl feltöltve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform><numerusform>%1 átnevezve erre: %2 és még %n további fájl átnevezve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform><numerusform>%1 áthelyezve ide: %2 és még %n további fájl áthelyezve.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform><numerusform>%1 és %n további fájl szinkronizálási konfliktussal rendelkezik.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 fájl szinkronizálási konfliktussal rendelkezik. Kérjük ellenőrizze a konfliktus fájlt!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform><numerusform>%1 és %n további fájlt nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nem sikerült szinkronizálni. Bővebb információ a naplófájlban.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Szinkronizálási aktivitás</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Törli az összes fájlt?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Összes fájl eltávolítása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Fájlok megtartása</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Biztonsági mentés észlelve</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Normal szinkronizáció</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Helyi file-ok megtartása konfliktusként</translation>
</message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(biztonsági mentés)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(biztonsági mentés: %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Ismeretlen állapot.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Várakozás a szinkronizálás elindítására.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Előkészítés szinkronizációhoz.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Szinkronizálás fut.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Legutolsó szinkronizálás sikeres volt.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Az utolsó szinkronizáció sikeresen lefutott, de néhány figyelmeztetés van.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Beállítás hiba.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Felhasználó megszakította.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Szinkronizálás megállítva.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (szinkronizálás megállítva)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Nincs érvényes könyvtár kiválasztva!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>A kiválasztott elérési út nem könyvtár!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nincs joga a kiválasztott könyvtár írásához!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2554,7 +2554,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Megosztás vele: %1</translation>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index d6c0291e5..9ef9bf603 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Connesso</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Servizio non disponibile</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Errore di rete</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Errore di configurazione</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Stato dell&apos;account sconosciuto</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>La cartella locale %1 non esiste.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 dovrebbe essere una cartella, ma non lo è.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 non è leggibile.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato rimosso.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato scaricato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 è stato aggiornato.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 è stato rinominato in %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 è stato spostato in %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 e %n altro file sono stati rimossi.</numerusform><numerusform>%1 e %n altri file sono stati rimossi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n altro file sono stati scaricati.</numerusform><numerusform>%1 e %n altri file sono stati scaricati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n altro file sono stati aggiornati.</numerusform><numerusform>%1 e %n altri file sono stati aggiornati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 è stato rinominato in %2 e %n altro file sono stati rinominati.</numerusform><numerusform>%1 è stato rinominato in %2 e %n altri file sono stati rinominati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 è stato spostato in %2 e %n altro file sono stati spostati.</numerusform><numerusform>%1 è stato spostato in %2 e %n altri file sono stati spostati.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 e %n altro file hanno conflitti di sincronizzazione.</numerusform><numerusform>%1 e %n altri file hanno conflitti di sincronizzazione.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 ha un conflitto di sincronizzazione. Controlla il file in conflitto!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>1% e %n altro file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform><numerusform>1% e %n altri file non sono stati sincronizzati a causa di errori. Controlla il log per i dettagli.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 non può essere sincronizzato a causa di un errore. Controlla il log per i dettagli.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Sincronizza attività</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Impossibile leggere il file di esclusione di sistema</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Una nuova cartella più grande di %1 MB è stata aggiunta: %2.
Vai nelle impostazioni per selezionarla se desideri scaricarla.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Vuoi rimuovere tutti i file?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Rimuovi tutti i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Mantieni i file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Backup rilevato</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Sincronizzazione normale</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Mantieni i file locali come conflitto</translation>
</message>
@@ -742,112 +742,112 @@ Se continui normalmente la sincronizzazione provocherai la sovrascrittura di tut
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Impossibile ripristinare lo stato della cartella</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>È stato trovato un vecchio registro di sincronizzazione &apos;%1&apos;, ma non può essere rimosso. Assicurati che nessuna applicazione lo stia utilizzando.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(copia di sicurezza)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(copia di sicurezza %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Stato non definito.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>In attesa di iniziare la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Preparazione della sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>La sincronizzazione è in corso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>L&apos;ultima sincronizzazione è stata completata correttamente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ultima sincronizzazione avvenuta, ma con avvisi relativi a singoli file.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Errore di configurazione.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Interrotto dall&apos;utente.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>La sincronizzazione è sospesa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (La sincronizzazione è sospesa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Nessuna cartella valida selezionata!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Il percorso selezionato non è una cartella!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Non hai i permessi di scrittura per la cartella selezionata!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 è già utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 contiene già una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 è un collegamento simbolico. La destinazione del collegamento contiene già una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>La cartella locale %1 è un collegamento simbolico. La destinazione del collegamento è già contenuta in una cartella utilizzata in una connessione di sincronizzazione delle cartelle. Selezionane un&apos;altra!</translation>
</message>
@@ -2562,7 +2562,7 @@ Non è consigliabile utilizzarlo.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Condividi con %1</translation>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index aeb4b7397..58870b85b 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>切断しました</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>接続しました</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>サービスが利用できません</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>ネットワークエラー</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>設定エラー</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>不明なアカウント状態</translation>
</message>
@@ -375,7 +375,7 @@
<location filename="../src/gui/activitywidget.cpp" line="580"/>
<source>Not Synced (%1)</source>
<extracomment>%1 is the number of not synced files.</extracomment>
- <translation type="unfinished"/>
+ <translation>未同期 (%1)</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="596"/>
@@ -430,7 +430,7 @@
<message>
<location filename="../src/gui/activitywidget.cpp" line="139"/>
<source>Action Required: Notifications</source>
- <translation type="unfinished"/>
+ <translation>操作が必要: 通知</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="144"/>
@@ -440,22 +440,22 @@
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="351"/>
<source>You received %n new notification(s) from %2.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%2 から %n の新しい通知がありました。</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/activitywidget.cpp" line="359"/>
<source>You received %n new notification(s) from %1 and %2.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%1 と %2 から %n の新しい通知がありました。</numerusform></translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="361"/>
<source>You received new notifications from %1, %2 and other accounts.</source>
- <translation type="unfinished"/>
+ <translation>%1 と %2 、その他アカウントから新しい通知がありました。</translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="365"/>
<source>%1 Notifications - Action Required</source>
- <translation type="unfinished"/>
+ <translation>通知 %1 - 操作が必要です。</translation>
</message>
</context>
<context>
@@ -524,7 +524,7 @@
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="772"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
</context>
<context>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>ローカルフォルダー %1 は存在しません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 はフォルダーのはずですが、そうではないようです。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 は読み込み可能ではありません。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 は削除されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 はダウンロードされました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 が更新されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 の名前が %2 に変更されました。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 は %2 に移動しました。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%1 とその他 %n 個のファイルが削除されました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%1 とその他 %n 個のファイルがダウンロードされました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%1 とその他 %n 個のファイルが更新されました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%1 を %2 にファイル名を変更し、その他 %n 個のファイル名を変更しました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%1 を %2 に移動し、その他 %n 個のファイルを移動しました。</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>%1 と その他 %n 個のファイルが同期で衝突しました。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
- <translation type="unfinished"/>
+ <translation>%1 が同期で衝突しています。コンフリクトファイルを確認してください。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
- <translation type="unfinished"><numerusform></numerusform></translation>
+ <translation><numerusform>エラーにより、%1 と その他 %n 個のファイルが同期できませんでした。ログで詳細を確認してください。</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>エラーにより %1 が未同期です。ログで詳細を確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>同期アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>システム上の除外ファイルを読み込めません</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>新しい %1 MB以上のフォルダーが追加されました: %2
ダウンロードしたい場合は、設定画面で選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,22 @@ Are you sure you want to perform this operation?</source>
本当にこの操作を実行しますか?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>すべてのファイルを削除しますか?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>すべてのファイルを削除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>ファイルを残す</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>バックアップが検出されました</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>正常同期</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>コンフリクト時にローカルファイルを保持</translation>
</message>
@@ -742,112 +742,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>フォルダーの状態をリセットできませんでした</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>古い同期ジャーナル &apos;%1&apos; が見つかりましたが、削除できませんでした。それを現在使用しているアプリケーションが存在しないか確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(バックアップ)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(%1をバックアップ)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>未定義の状態。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>同期開始を待機中</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>同期の準備中。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>同期を実行中です。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>最後の同期は成功しました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新の同期は成功しました。しかし、一部のファイルに問題がありました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>設定エラー。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>ユーザーによる中止。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>同期を一時停止しました。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同期を一時停止)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>有効なフォルダーが選択されていません!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>指定のパスは、フォルダーではありません!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>選択されたフォルダーに書き込み権限がありません</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 はすでに同期フォルダーとして利用されています。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 にはすでに同期フォルダーとして利用されてるフォルダを含んでいます。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 はシンボリックリンクです。リンク先のフォルダにはすでに同期フォルダーとして利用されているフォルダーを含みます。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>ローカルフォルダー %1 には同期フォルダーとして利用されているフォルダーがあります。他のフォルダーを選択してください!</translation>
</message>
@@ -862,7 +862,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="241"/>
<source>Synchronizing with local folder</source>
- <translation type="unfinished"/>
+ <translation>ローカルフォルダーを同期中</translation>
</message>
<message>
<location filename="../src/gui/folderstatusdelegate.cpp" line="285"/>
@@ -975,7 +975,7 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<location filename="../src/gui/folderstatusmodel.cpp" line="938"/>
<source>%5 left, %1 of %2, file %3 of %4</source>
<extracomment>Example text: &quot;5 minutes left, 12 MB of 345 MB, file 6 of 7&quot;</extracomment>
- <translation type="unfinished"/>
+ <translation>残り %5分、%2中 %1完了 、%4中 %3 ファイル完了</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="944"/>
@@ -1523,24 +1523,24 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/notificationwidget.cpp" line="50"/>
<source>Created at %1</source>
- <translation type="unfinished"/>
+ <translation>%1 を作成しました。</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.cpp" line="99"/>
<source>Closing in a few seconds...</source>
- <translation type="unfinished"/>
+ <translation>数秒以内に接続を終了します。</translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.cpp" line="133"/>
<source>%1 request failed at %2</source>
<extracomment>The second parameter is a time, such as 'failed at 09:58pm'</extracomment>
- <translation type="unfinished"/>
+ <translation>リクエスト %1 が %2 に失敗 </translation>
</message>
<message>
<location filename="../src/gui/notificationwidget.cpp" line="139"/>
<source>&apos;%1&apos; selected at %2</source>
<extracomment>The second parameter is a time, such as 'selected at 09:58pm'</extracomment>
- <translation type="unfinished"/>
+ <translation>&apos;%1&apos; が %2 に選択されました</translation>
</message>
</context>
<context>
@@ -1684,7 +1684,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="51"/>
<source>&amp;Email</source>
- <translation type="unfinished"/>
+ <translation>メール(&amp;E)</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudhttpcredspage.cpp" line="61"/>
@@ -1918,7 +1918,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/owncloudpropagator.cpp" line="712"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
</context>
<context>
@@ -1951,7 +1951,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="552"/>
<source>The downloaded file is empty despite the server announced it should have been %1.</source>
- <translation type="unfinished"/>
+ <translation>サーバーが通知しているファイルは %1 であるべきですが、ダウンロードファイルは空でした。</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="694"/>
@@ -1966,7 +1966,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="792"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
</context>
<context>
@@ -2007,7 +2007,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="181"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
</context>
<context>
@@ -2038,7 +2038,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagatorjobs.cpp" line="245"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
</context>
<context>
@@ -2064,7 +2064,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagateremotemkdir.cpp" line="148"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
</context>
<context>
@@ -2092,7 +2092,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="175"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
</context>
<context>
@@ -2141,7 +2141,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/propagateupload.cpp" line="782"/>
<source>Error writing metadata to the database</source>
- <translation type="unfinished"/>
+ <translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
</context>
<context>
@@ -2383,7 +2383,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/sharedialog.cpp" line="113"/>
<source>Retrieving maximum possible sharing permissions from server...</source>
- <translation type="unfinished"/>
+ <translation>サーバーから共有権限を取得できる最大数で取得しています</translation>
</message>
<message>
<location filename="../src/gui/sharedialog.cpp" line="169"/>
@@ -2561,7 +2561,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>%1 と共有</translation>
@@ -2973,12 +2973,12 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/syncengine.cpp" line="743"/>
<source>Unable to read the blacklist from the local database</source>
- <translation type="unfinished"/>
+ <translation>ローカルデータベースからブラックリストを読み込みできません</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="776"/>
<source>Unable to read from the sync journal.</source>
- <translation type="unfinished"/>
+ <translation>同期ジャーナルから読み込みできません</translation>
</message>
<message>
<location filename="../src/libsync/syncengine.cpp" line="822"/>
@@ -3194,7 +3194,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="237"/>
<source>The server on account %1 runs an old and unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
- <translation type="unfinished"/>
+ <translation>%1 アカウントのサーバーのバージョン %2 は古く、未サポートです。この未サポートのサーバーバージョンとこのクライアントでの組み合わせは、未テストで潜在的な危険があります。ご利用は自己責任でお願いいたします。</translation>
</message>
<message>
<location filename="../src/gui/owncloudgui.cpp" line="275"/>
@@ -3636,7 +3636,7 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="37"/>
<source>Server version downloaded, copied changed local file into conflict file</source>
- <translation type="unfinished"/>
+ <translation>サーバー側バージョンがダウンロードされました。変更されたローカルファイルは、コンフリクトファイルにコピーしました。</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="39"/>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 5939d201b..7a44f3e51 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Logget ut</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Tilkoblet</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Tjeneste utilgjengelig</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Nettverksfeil</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Konfigurasjonsfeil</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Ukjent kontotilstand</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokal mappe %1 eksisterer ikke.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 skal være en mappe men er ikke det.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 kan ikke leses.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt fjernet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt lastet ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har blitt oppdatert.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har blitt omdøpt til %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har blitt flyttet til %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunne ikke synkroniseres pga. en feil. Se loggen for detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Synkroniseringsaktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Klarte ikke å lese systemets ekskluderingsfil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>En ny mappe større enn %1 MB er blitt lagt til: %2.
Gå til Innstillinger og velg mappen hvis du ønsker å laste den ned.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Fjerne alle filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Fjern alle filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Behold filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Backup oppdaget</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Behold lokale filer som konflikt</translation>
</message>
@@ -742,112 +742,112 @@ Hvis synkroniseringen fortsetter som normalt, vil alle filene dine bli overskrev
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Klarte ikke å tilbakestille mappetilstand</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>En gammel synkroniseringsjournal &apos;%1&apos; ble funnet men kunne ikke fjernes. Pass på at ingen applikasjoner bruker den.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation> (sikkerhetskopi)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation> (sikkerhetskopi %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Udefinert tilstand.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Venter på å starte synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Forbereder synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Synkronisering kjører.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Siste synkronisering var vellykket.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Siste synkronisering var vellykket, men med advarsler på enkelte filer.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Feil med oppsett.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Brukeravbrudd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Synkronisering er satt på pause.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synkronisering er satt på pause)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Ingen gyldig mappe valgt!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Den valgte stien er ikke en mappe!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Du har ikke skrivetilgang til den valgte mappen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 er allerede brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 inneholder allerede en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 er en symbolsk lenke. Målet for lenken inneholder allerede en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokale mappen %1 er en symbolsk lenke. Målet for lenken er allerede en undermappe av en mappe brukt i en mappe-synkronisering. Velg en annen!</translation>
</message>
@@ -2563,7 +2563,7 @@ Det er ikke tilrådelig å bruke den.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Del med %1</translation>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index d0348356e..607f30d04 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Afgemeld</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Niet verbonden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Verbonden</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Dienst niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Netwerkfout</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Configuratiefout</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Onbekende account-status</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokale map %1 bestaat niet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 zou een map moeten zijn, maar is dat niet.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 is niet leesbaar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 is verwijderd.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 is gedownload.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 is bijgewerkt.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 is hernoemd naar %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 is verplaatst naar %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kon niet worden gesynchroniseerd door een fout. Bekijk het log voor details.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Synchronisatie-activiteit</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Kon het systeem-uitsluitingsbestand niet lezen</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Een nieuwe map groter dan %1 MB is toegevoegd: %2
Ga naar de instellingen om het te selecteren als u deze wilt downloaden.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,22 @@ 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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Verwijder alle bestanden?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Verwijder alle bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Bewaar bestanden</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,17 @@ 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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Backup gedetecteerd</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Normale synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Behoud lokale bestanden als conflict</translation>
</message>
@@ -742,112 +742,112 @@ Doorgaan met deze synchronisatie overschrijft al uw bestandend door een eerdere
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Kan de beginstaat van de map niet terugzetten</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Een oud synchronisatieverslag &apos;%1&apos; is gevonden maar kan niet worden verwijderd. Zorg ervoor dat geen applicatie dit bestand gebruikt.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Ongedefiniëerde staat</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>In afwachting van synchronisatie.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Synchronisatie wordt voorbereid</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Bezig met synchroniseren.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Laatste synchronisatie was geslaagd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Laatste synchronisatie geslaagd, maar met waarschuwingen over individuele bestanden.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Installatiefout.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Afgebroken door gebruiker.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Synchronisatie gepauzeerd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronisatie onderbroken)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Geen geldige map geselecteerd!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Het geselecteerde pad is geen map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>U heeft geen permissie om te schrijven naar de geselecteerde map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 wordt al in de mapsync gebruikt. Kies een andere map!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 bevat al een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 is een symbolische link. De doellink bevat al een map die in een mapsync verbinding wordt gebruikt. Kies een andere!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 zit al in een map die wordt gebruikt voor een mapsync verbinding. Kies een andere!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokale map %1 is een symbolische link. De doellink zit al in een map die in een mapsync verbinding wordt gebruikt. Kies een andere!</translation>
</message>
@@ -2564,7 +2564,7 @@ We adviseren deze site niet te gebruiken.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Delen met %1</translation>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index a9f2d26a9..0d6a61820 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Odłączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Rozłączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Połączony</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Usługa niedostępna</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Błąd sieci</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Błąd konfiguracji</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Status konta nieznany</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Folder lokalny %1 nie istnieje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 powinien być katalogiem, ale nie jest.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 jest nie do odczytu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 został usunięty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 został ściągnięty.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 został uaktualniony.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 zmienił nazwę na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 został przeniesiony do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nie może zostać zsynchronizowany z powodu błędu. Zobacz szczegóły w logu.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Aktywności synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Nie można przeczytać pliku wyłączeń</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Nowy folder większy od %1 MB został dodany
Przejdź do ustawień i zaznacz go, jeśli chcesz go pobrać.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,22 @@ Może to być spowodowane faktem, że folder został przekonfigurowany lub wszys
Czy jesteś pewien, że chcesz wykonać tę operację ? </translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Usunąć wszystkie pliki?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Usuń wszystkie pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Pozostaw pliki</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,17 @@ Być może została przywrócona kopia zapasowa serwera?
Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwotny stan. Czy chcesz zatrzymać swoje ostatnie pliki i nadać im status konfliktu?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Wykryto kopię zapasową.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Normalna synchronizacja.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Zatrzymaj pliki lokalne i ustaw status konfliktu.</translation>
</message>
@@ -742,112 +742,112 @@ Jeśli kontynuujesz synchronizację, pliki zostaną nadpisane przez swój pierwo
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Nie udało się zresetować stanu folderu</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Stary sync journal &apos;%1&apos; został znaleziony, lecz nie mógł być usunięty. Proszę się upewnić, że żaden program go obecnie nie używa.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(kopia zapasowa)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(kopia zapasowa %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Niezdefiniowany stan</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Poczekaj na rozpoczęcie synchronizacji.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Przygotowuję do synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Synchronizacja w toku</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Ostatnia synchronizacja zakończona powodzeniem.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Ostatnia synchronizacja udana, ale istnieją ostrzeżenia z pojedynczymi plikami.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Błąd ustawień.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Użytkownik anulował.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation> %1 (Synchronizacja jest zatrzymana)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Nie wybrano poprawnego folderu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Wybrana ścieżka nie jest katalogiem!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nie masz uprawnień, aby zapisywać w tym katalogu!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Wybrany folder lokalny %1 jest już użyty na potrzeby innej synchronizacji. Proszę wybrać inny folder lokalny.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokalny folder %1 już zawiera folder użyty na potrzeby synchronizacji. Proszę wybrać inny folder lokalny.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Lokalny folder %1 jest dowiązaniem symbolicznym. Cel dowiązania zawiera folder użyty na potrzeby innej synchronizacji. Proszę wybrać inny folder lokalny bądź dowiązanie.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2563,7 +2563,7 @@ Niezalecane jest jego użycie.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Współdzielone z %1</translation>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 3aa8a1756..1577b864e 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Sessão terminada</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Servidor indisponível</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Erro de configuração</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Estado de conta desconhecido</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 devia ser uma pasta mas não é</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 não é legível.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi descarregado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>&apos;%1&apos; e %n outro(s) ficheiro(s) foram removidos</numerusform><numerusform>&apos;%1&apos; e %n outros ficheiros foram removidos</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n outro ficheiro foram removidos.</numerusform><numerusform>%1 e %n outros ficheiros foram removidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n outro ficheiro foram actualizados.</numerusform><numerusform>%1 e %n outros ficheiros foram actualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado para %2 e %n outro ficheiro foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros ficheiros foram renomeados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido para %2 e %n outro ficheiro foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros ficheiros foram movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 tem e %n outro ficheiro têm problemas de sincronização.</numerusform><numerusform>%1 tem e %n outros ficheiros têm problemas de sincronização.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 tem um problema de sincronização. Por favor verifique o ficheiro com conflito!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 e %n outro ficheiro não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform><numerusform>%1 e %n outros ficheiros não podem ser sincronizados devido a erros. Consulte o registo de eventos para mais detalhes.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 não sincronizou devido a um erro. Verifica o log para mais detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o ficheiro system exclude</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Foi adicionada uma nova pasta maior do que %1 MB: %2.
Por favor, vá às definições para a selecionar, se a desejar transferir.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Remover todos os ficheiros?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Remover todos os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Manter os ficheiros</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Cópia de segurança encontrada</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Ficheiros Locais como Conflito</translation>
</message>
@@ -742,112 +742,112 @@ Continuando a sincronização fará com que todos os seus ficheiros sejam substi
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Não foi possível repor o estado da pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Não foi possível remover o antigo &apos;journal sync&apos; &apos;%1&apos;. Por favor certifique-se que nenhuma aplicação o está a utilizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(cópia de segurança)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(cópia de segurança %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>À espera de começar a sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>A preparar para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>A sincronização está em execução.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi efetuada com sucesso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi efectuada com sucesso, mas existem avisos sobre alguns ficheiros.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Erro na instalação.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Cancelado pelo utilizador.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>A sincronização está pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (A sincronização está pausada)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Não foi selecionada nenhuma pasta válida!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>O caminho selecionado não é uma pasta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Não tem permissões de escrina na pasta seleccionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já foi usada numa ligação da sincronização da pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já contém uma pasta utilizada nua sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 é uma hiperligação simbólica. A hiperligação de destino já contém uma pasta usada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já contém uma pasta usada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 é uma hiperligação simbólica. A hiperligação de destino já contém uma pasta usada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
@@ -2562,7 +2562,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Partilhar com %1</translation>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index 81eca85d7..63d97d222 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Conectado</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Serviço indisponível</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Erro de rede</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Erro de configuração</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Estado da conta desconhecido</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>A pasta local %1 não existe.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 deve ser uma pasta, mas não é.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 não pode ser lido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi removido.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi baixado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 foi atualizado.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 foi renomeado para %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 foi movido para %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 e %n outro arquivo foi removido.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>%1 e %n outro arquivo foi baixado.</numerusform><numerusform>%1 e %n outros arquivos foram removidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 e %n outro arquivo foi atualizado.</numerusform><numerusform>%1 e %n outros arquivos foram atualizados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation><numerusform>%1 foi renomeado para %2 e %n outro arquivo foi renomeado.</numerusform><numerusform>%1 foi renomeado para %2 e %n outros arquivos foram renomeados.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation><numerusform>%1 foi movido para %2 e %n outro arquivo foi movido.</numerusform><numerusform>%1 foi movido para %2 e %n outros arquivos foram movidos.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation><numerusform>%1 tem e %n outro arquivo tem conflito na sincronização.</numerusform><numerusform>%1 tem e %n outros arquivos teem conflito na sincronização.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation>%1 tem um conflito na sincronização. Por favor verifique o arquivo de conflito!</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation><numerusform>%1 e %n outro arquivo não pode ser sincronizado devido a erros. Veja o log para detalhes.</numerusform><numerusform>%1 e %n outros arquivos não poderam ser sincronizados devido a erros. Veja o log para detalhes.</numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 não pode ser sincronizado devido a um erro. Veja o log para obter detalhes.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Atividade de Sincronização</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Não foi possível ler o sistema de arquivo de exclusão</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Uma nova pasta maior que %1 MB foi adicionada: %2.
Por favor, vá nas configurações para selecionar o que você deseja para fazer o download.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Deseja Remover Todos os Arquivos?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Remover todos os arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Manter arquivos</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Backup detectado</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Sincronização Normal</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Manter Arquivos Locais como Conflito</translation>
</message>
@@ -742,112 +742,112 @@ Continuando a sincronização como normal fará com que todos os seus arquivos s
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Não foi possível redefinir o estado da pasta</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Uma velha revista de sincronização &apos;%1&apos; foi encontrada, mas não pôde ser removida. Por favor, certifique-se de que nenhuma aplicação está a usá-la.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation> (backup)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation> (backup %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Estado indefinido.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>À espera do início da sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Preparando para sincronização.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>A sincronização está ocorrendo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>A última sincronização foi feita com sucesso.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>A última sincronização foi executada com sucesso, mas com advertências em arquivos individuais.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Erro de Configuração.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Usuário Abortou.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Sincronização pausada.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Pausa na Sincronização) </translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Nenhuma pasta válida selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>O caminho selecionado não é uma pasta!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Voce não tem permissão para escrita na pasta selecionada!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já está sendo utilizada em uma conexão de sincronização de pastas. Por favor, escolha uma outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já contém uma pasta utilizada numa ligação de sincronização de pasta. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 é um link simbólico. O destino do link já contém uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 já está contida em uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>A pasta local %1 é um link simbólico. O destino do link já está contido em uma pasta usada em uma conexão de sincronização de pastas. Por favor, escolha outra!</translation>
</message>
@@ -2563,7 +2563,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Compartilhar com %1</translation>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 8c25a75a3..156ad4a25 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Вышли из аккаунта</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Отсоединен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Соединен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Сервис недоступен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Ошибка сети</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Ошибка конфигурации</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Неизвестное состояние учетной записи</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальный каталог %1 не существует.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 должен быть папкой, но ей не является.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 не может быть прочитан.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>&apos;%1&apos; был удалён</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 был загружен.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 был обновлён.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 был переименован в %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 был перемещён в %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 не может быть синхронизирован из-за ошибки. Смотрите детали в журнале.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Невозможно прочесть системный файл исключений</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Новый каталог размером более %1 МБ был добавлен: %2.
Пожалуйста, перейдите в настройки, если хотите скачать его.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,22 @@ Are you sure you want to perform this operation?</source>
Вы действительно хотите выполнить эту операцию?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Удалить все файлы?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Удалить все файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Сохранить файлы</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Обнаружена резервная копия</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Обычная синхронизация</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Сохранить локальные файлы как конфликтующие</translation>
</message>
@@ -742,112 +742,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Невозможно сбросить состояние каталога</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Найден старый журнал синхронизации &apos;%1&apos;, и он не может быть удалён. Убедитесь что он не открыт в другом приложении.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(бэкап)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(бэкап %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Неопределенное состояние.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Ожидание запуска синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Подготовка к синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Идет синхронизация.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Последняя синхронизация прошла успешно.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последняя синхронизация прошла успешно, но были предупреждения для некоторых файлов.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Ошибка установки.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Отмена пользователем.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Синхронизация приостановлена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%! (синхронизация приостановлена)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Не выбран валидный каталог!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Выбранный путь не является папкой!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>У вас недостаточно прав для записи в выбранный каталог!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка %1 уже используется для синхронизации. Пожалуйста выберите другую!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка %1 уже содержит папку, которая используется для синхронизации. Пожалуйста выберите другую!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка %1 является символьной ссылкой. Эта ссылка уже содержит папку для синхронизации. Пожалуйста выберите другую!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка %1 уже содержит папку, которая используется для синхронизации. Пожалуйста выберите другую!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Локальная папка %1 является символьной ссылкой. Эта ссылка уже содержит папку, которая используется для синхронизации. Пожалуйста укажите другую!</translation>
</message>
@@ -2562,7 +2562,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Поделиться с %1</translation>
diff --git a/translations/client_sk.ts b/translations/client_sk.ts
index 2c425fe7f..d7cd4b1f9 100644
--- a/translations/client_sk.ts
+++ b/translations/client_sk.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Odhlásený</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Odpojený</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Pripojené</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Služba nedostupná</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Chyba siete</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Chyba nastavenia</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Neznámy stav účtu</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Lokálny priečinok %1 neexistuje.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 by mal byť priečinok, avšak nie je.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 nie je čitateľný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol zmazaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol stiahnutý.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 bol aktualizovaný.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 bol premenovaný na %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 bol presunutý do %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 nemôže byť synchronizovaný kvôli chybe. Pozrite sa do logu pre podrobnosti.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Aktivita synchronizácie</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Nemožno čítať systémový exclude file</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Bol pridaný nový priečinok, väčší ako %1 MB: %2.
Pokiaľ si ho prajete stiahnuť, vyberte ho v nastaveniach.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,39 +700,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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Odstrániť všetky súbory?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Odstrániť všetky súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Ponechať súbory</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Záloha je dostupná</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Bežná synchronizácia</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -740,112 +740,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Nemožno resetovať stav priečinka</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Starý synchronizačný žurnál &apos;%1&apos; nájdený, avšak neodstrániteľný. Prosím uistite sa, že žiadna aplikácia ho práve nevyužíva.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation> (záloha)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation> (záloha %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Nedefinovaný stav.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Príprava na synchronizáciu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Synchronizácia prebieha.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Posledná synchronizácia sa úspešne skončila.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Posledná synchronizácia bola úspešná, ale s varovaniami pre individuálne súbory.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Chyba pri inštalácii.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Zrušené používateľom.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Synchronizácia je pozastavená.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synchronizácia je pozastavená)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Nebol zvolený platný priečinok.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Zvolená cesta nie je priečinok.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Nemáte oprávnenia pre zápis do daného priečinka!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2555,7 +2555,7 @@ Nie je vhodné ju používať.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Zdieľať s %1</translation>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index 292551167..05e84f6aa 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Odjavljeno</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Brez povezave</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Povezano</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Storitev ni na voljo</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Omrežna napaka</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Napaka nastavitve</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Neznano stanje računa</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Krajevna mapa %1 ne obstaja.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 bi morala biti mapa, pa ni.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 ni mogoče brati.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je odstranjena.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je prejeta.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>Datoteka %1 je posodobljena.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>Datoteka %1 je preimenovana v %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>Datoteka %1 je premaknjena v %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>Datoteke %1 zaradi napake ni mogoče uskladiti. Več podrobnosti je zabeleženih v dnevniški datoteki.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Dejavnost usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Ni mogoče prebrati sistemske izločitvene datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>Dodana je nova mapa, ki presega %1 MB: %2.
Med nastavitvami jo lahko izberete in označite za prejem.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,39 +700,39 @@ Mapa je bila morda odstranjena, ali pa so bile spremenjene nastavitve.
Ali ste prepričani, da želite izvesti to opravilo?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Ali naj bodo odstranjene vse datoteke?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Odstrani vse datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Ohrani datoteke</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Varnostna kopija je zaznana</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Običajno usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Ohrani krajevne datoteke kot datoteke v sporu</translation>
</message>
@@ -740,112 +740,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Ni mogoče ponastaviti stanja mape</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Obstaja starejši dnevnik usklajevanja &apos;%1&apos;, vendar ga ni mogoče odstraniti. Preverite, ali je datoteka v uporabi.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(varnostna kopija)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(varnostna kopija %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Nedoločeno stanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Čakanje začetek usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Poteka priprava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Usklajevanje je v teku.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Zadnje usklajevanje je bilo uspešno končano.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Zadnje usklajevanje je bilo sicer uspešno, vendar z opozorili za posamezne datoteke.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Napaka nastavitve.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Uporabniška prekinitev.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Usklajevanje je začasno v premoru.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (usklajevanje je v premoru)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Ni izbrane veljavne mape!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Izbrana pot ni mapa!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Ni ustreznih dovoljenj za pisanje v izbrano mapo!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Krajevna mapa %1 je že v določena za usklajevanje. Izbrati je treba drugo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Krajevna mapa %1 že vključuje mapo, ki je določena za usklajevanje. Izbrati je treba drugo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Krajevna mapa %1 je simbolna povezava. Cilj povezave že vsebuje mapo, ki je uporabljena pri povezavi usklajevanja mape. Izberite drugo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Krajevna mapa %1 je že v določena za usklajevanje. Izbrati je treba drugo.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Krajevna mapa %1 je simbolna povezava. Cilj povezave že vsebuje mapo, ki je uporabljena pri povezavi usklajevanja mape. Izberite drugo.</translation>
</message>
@@ -2560,7 +2560,7 @@ Uporaba ni priporočljiva.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Omogoči souporabo z %1</translation>
diff --git a/translations/client_sr.ts b/translations/client_sr.ts
index 6e51025d6..1280244ac 100644
--- a/translations/client_sr.ts
+++ b/translations/client_sr.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Одјављен</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Неповезан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Повезан</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Услуга није доступна</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Грешка мреже</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Грешка подешавања</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Непознато стање налога</translation>
</message>
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Локална фасцикла %1 не постоји.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 би требало да је фасцикла али није.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 није читљив.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 је уклоњен.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 је преузет.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 је ажуриран.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 је преименован у %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 је премештен у %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 није синхронизован због грешке. Погледајте записник за детаље.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Активност синхронизације</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Не могу да прочитам системски списак за игнорисање</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Уклонити све фајлове?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Уклони све фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Остави фајлове</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Не могу да ресетујем стање фасцикле</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Пронађен је стари журнал синхронизације „%1“ али се не може уклонити. Проверите да га нека апликација тренутно не користи.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation> (резерва)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation> (резерва %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Неодређено стање.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Припремам синхронизацију.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Синхронизација у току.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Последња синхронизација је била успешна.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Последња синхронизација је била успешна али са упозорењима за поједине фајлове.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Грешка подешавања.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Корисник прекинуо.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Синхронизација је паузирана.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (синхронизација паузирана)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Немате дозволе за упис у изабрану фасциклу!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2556,7 +2556,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Подели са %1</translation>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 3cd7f6d19..94cd015c1 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Utloggad</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Bortkopplad</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Ansluten</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Tjänsten är inte tillgänglig</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Nätverksfel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Konfigurationsfel</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Okänd kontostatus</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Den lokala mappen %1 finns inte.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 borde vara en mapp, men är inte det.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 är inte läsbar.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 har tagits bort.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 har laddats ner.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 har uppdaterats.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 har döpts om till %2.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 har flyttats till %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 kunde inte synkroniseras på grund av ett fel. Kolla loggen för ytterligare detaljer.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Synk aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Kunde inte läsa systemets exkluderings-fil</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>En ny mapp större än %1 MB har lagts till: %2.
Var god gå in i inställningarna för att markera mappen om du vill ladda ner den.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,22 @@ 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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Ta bort alla filer?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Ta bort alla filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Behåll filer</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,17 @@ 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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Backup upptäckt</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Normal synkronisation</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Behåll lokala filer som konflikt</translation>
</message>
@@ -742,112 +742,112 @@ Om du fortsätter synkningen leder till att dina filer skrivs över av äldre fi
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Kunde inte återställa mappens skick</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>En gammal synkroniseringsjournal &apos;%1&apos; hittades, men kunde inte raderas. Vänligen se till att inga program för tillfället använder den.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(säkerhetskopia)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(säkerhetkopia %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Okänt tillstånd.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Väntar på att starta synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Förbereder synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Synkronisering pågår.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Senaste synkronisering lyckades.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Senaste synkning lyckades, men det finns varningar för vissa filer!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Inställningsfel.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Användare Avbryt</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Synkronisering är pausad.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Synk är stoppad)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Ingen giltig mapp markerad!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Den markerade sökvägen är inte en mapp!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Du har inga skrivrättigheter till den valda mappen!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>Den lokala mappen %1 synkas redan. Var god välj en annan!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokala mappen %1 innehåller redan en mapp som synkas. Var god välj en annan!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokala mappen %1 är en symbolisk länk. Länkmålet innehåller redan en mapp som synkas. Var god välj en annan!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokala mappen %1 finns redan inuti en mapp som synkas. Var god välj en annan!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>Den lokala mappen %1 är en symbolisk länk. Länkmålet finns redan inuti en mapp som synkas. Var god välj en annan!</translation>
</message>
@@ -2563,7 +2563,7 @@ Det är inte lämpligt använda den.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Dela med %1</translation>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index a5c0404b9..de7582fde 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>ยกเลิกการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>เชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>ไม่สามารถให้บริการได้</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>ข้อผิดพลาดของเครือข่าย</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>กำหนดค่าผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>ไม่ระบุสถานะบัญชี</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>โฟลเดอร์ต้นทาง %1 ไม่มีอยู่</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 ควรจะเป็นโฟลเดอร์ แต่ทำไม่ได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>ไม่สามารถอ่านข้อมูล %1 ได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกลบออก</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกดาวน์โหลด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 ได้ถูกอัพเดทเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 ได้ถูกเปลี่ยนชื่อเป็น %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 ได้ถูกย้ายไปยัง %2</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆได้ถูกลบออก</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>%1 และ %n ไฟล์อื่นๆ ได้รับการอัพเดท</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 ไม่สามารถประสานข้อมูลเนื่องจากมีข้อผิดพลาด ดูบันทึกสำหรับรายละเอียด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>ความเคลื่อนไหวของการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>ไม่สามารถอ่าน ยกเว้นไฟล์ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>โฟลเดอร์ใหม่มีขนาดใหญ่กว่า %1 เมกะไบต์ ได้ถูกเพิ่ม: %2
กรุณาไปตั้งค่าถ้าคุณต้องการให้มันดาวน์โหลดได้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,39 +700,39 @@ Are you sure you want to perform this operation?</source>
คุณแน่ใจว่าคุณต้องการที่จะดำเนินการนี้?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>ลบไฟล์ทั้งหมด?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>ลบไฟล์ทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>เก็บไฟล์เอาไว้</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -740,112 +740,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>ไม่สามารถรีเซ็ตสถานะโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>บนบันทึกการประสานข้อมูลเก่า &apos;%1&apos; แต่ไม่สามารถลบออกได้ กรุณาตรวจสอบให้แน่ใจว่าไม่มีแอพฯ หรือการทำงานใดๆที่ใช้มันอยู่</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(สำรองข้อมูล)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(สำรองข้อมูล %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>สถานะที่ยังไม่ได้ถูกกำหนด</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>กำลังรอเริ่มต้นการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>กำลังเตรียมการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>การประสานข้อมูลกำลังทำงาน</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>ประสานข้อมูลครั้งล่าสุดเสร็จเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>การประสานข้อมูลสำเร็จ แต่มีคำเตือนในแต่ละไฟล์</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>เกิดข้อผิดพลาดในการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>ยกเลิกผู้ใช้</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>การประสานข้อมูลถูกหยุดไว้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (การประสานข้อมูลถูกหยุดชั่วคราว)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>เลือกโฟลเดอร์ไม่ถูกต้อง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>เส้นทางที่เลือกไม่ใช่โฟลเดอร์!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>คุณมีสิทธิ์ที่จะเขียนโฟลเดอร์ที่เลือกนี้!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>โฟลเดอร์ต้นทาง %1 ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>เนื้อหาโฟลเดอร์ต้นทาง %1 ได้ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>โฟลเดอร์ต้นทาง %1 เป็นการเชื่อมโยงสัญลักษณ์ ลิงค์เป้าหมายมีเนื้อหาโฟลเดอร์ที่ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>เนื้อหาของโฟลเดอร์ต้นทาง %1 ไดถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>โฟลเดอร์ต้นทาง %1 เป็นการเชื่อมโยงสัญลักษณ์
เป้าหมายของลิงค์มีเนื้อหาที่ถูกใช้ไปแล้วในโฟลเดอร์ที่ประสานข้อมูล กรุณาเลือกอีกอันหนึ่ง!</translation>
@@ -2561,7 +2561,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>แชร์กับ %1</translation>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index d3548252a..33eba8b6f 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Oturum sonlandırıldı</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>Bağlandı</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Hizmet kullanılamıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Ağ hatası</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Yapılandırma hatası</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Bilinmeyen hesap durumu</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>%1 yerel klasörü mevcut değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 bir dizin olmalı, ancak değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 okunabilir değil.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 kaldırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 indirildi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 güncellendi.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1, %2 olarak adlandırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1, %2 konumuna taşındı.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation><numerusform>&apos;%1&apos; ve diğer %n dosya kaldırıldı.</numerusform><numerusform>&apos;%1&apos; ve diğer %n dosya kaldırıldı.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation><numerusform>&apos;%1&apos; ve diğer %n dosya indirildi.</numerusform><numerusform>&apos;%1&apos; ve diğer %n dosya indirildi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation><numerusform>&apos;%1&apos; ve diğer %n dosya güncellendi.</numerusform><numerusform>&apos;%1&apos; ve diğer %n dosya güncellendi.</numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 bir hata nedeniyle eşitlenemedi. Ayrıntılar için günlüğe bakın.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Eşitleme Etkinliği</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Sistem hariç tutulma dosyası okunamadı</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>%1 MB boyutundan daha büyük bir yeni klasör eklendi: %2\n
İndirmek istiyorsanız lütfen ayarlar bölümünden seçin.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,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="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Tüm Dosyalar Kaldırılsın mı?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Tüm dosyaları kaldır</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Dosyaları koru</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -723,17 +723,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Yedek bulundu</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>Normal Eşitleme</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>Çakışma Durumunda Yerel Dosyaları Tut</translation>
</message>
@@ -741,112 +741,112 @@ Bunun nedeni sunucuda bir yedeğin geri yüklenmesinden dolayı olabilir. Eşitl
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Klasör durumu sıfırılanamadı</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Eski eşitleme günlüğü &apos;%1&apos; bulundu ancak kaldırılamadı. Başka bir uygulama tarafından kullanılmadığından emin olun.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation> (yedek)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation> (yedek %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Tanımlanmamış Durum.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>Eşitlemenin başlanması bekleniyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Eşitleme için hazırlanıyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Eşitleme çalışıyor.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Son Eşitleme başarılı oldu.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Son eşitleme başarılıydı, ancak tekil dosyalarda uyarılar vardı.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Kurulum Hatası.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Kullanıcı İptal Etti.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Eşitleme duraklatıldı.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Eşitleme duraklatıldı)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>Geçerli klasör seçilmedi!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>Seçilen yol bir klasör değil!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>Seçilen klasöre yazma izniniz yok!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü zaten bir eşitleme bağlantısında kullanılan klasördür. Lütfen farklı bir seçim yapın!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü zaten bir eşitleme klasörü içermektedir. Lütfen farklı bir seçim yapın!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü sembolik bağlantıdır. Bu bağlantının işaretlediği klasörde zaten yapılandırılmış bir klasör mevcut. Lütfen farklı bir seçim yapın!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü zaten bir eşitleme klasörü içindedir. Lütfen farklı bir seçim yapın!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>%1 yerel klasörü sembolik bağlantıdır. Bu bağlantının işaretlediği klasör zaten yapılandırılmış bir klasör içindedir. Lütfen farklı bir seçim yapın!</translation>
</message>
@@ -2561,7 +2561,7 @@ Kullanmanız önerilmez.</translation>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>%1 ile paylaş</translation>
diff --git a/translations/client_uk.ts b/translations/client_uk.ts
index 309d973a5..fca4ed834 100644
--- a/translations/client_uk.ts
+++ b/translations/client_uk.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>Вимкнутий</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>Від&apos;єднаний</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>З&apos;єднаний</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>Сервіс недоступний</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>Помилка мережі</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>Помилка конфігурації</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>Невідомий стан облікового запису</translation>
</message>
@@ -579,157 +579,157 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>Локальна тека %1 не існує.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 не читається.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 видалено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 завантажено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 оновлено.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 перейменовано на %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 переміщено в %2.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 не може синхронізуватися через помилки. Дивіться деталі в журналі.</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>Журнал синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>Неможливо прочитати виключений системний файл</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<source>This sync would remove all the files in the sync folder '%1'.
This might be because the folder was silently reconfigured, or that all the files were manually removed.
Are you sure you want to perform this operation?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>Видалити усі файли?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>Видалити усі файли</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>Зберегти файли</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>Резервну копію знайдено</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -737,112 +737,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>Не вдалося скинути стан теки</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>Знайдено старий журнал синхронізації &apos;%1&apos;, його неможливо видалити. Будь ласка, впевніться що він не відкритий в іншій програмі.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>Невизначений стан.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>Підготовка до синхронізації</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>Синхронізація запущена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>Остання синхронізація була успішною.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>Остання синхронізація пройшла вдало, але були зауваження про деякі файли.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>Помилка установки.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>Відмінено користувачем.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>Синхронізація призупинена.</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (Синхронізація призупинена)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>У вас немає прав на запис в цю теку!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation type="unfinished"/>
</message>
@@ -2551,7 +2551,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Поділитися з %1</translation>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index d4715bb2e..3edc06aa1 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>连接已断开</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>已连接</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>服务不可用</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>网络错误</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>配置错误</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>未知的账户状态</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>本地文件夹 %1 不存在。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>%1 应该是一个文件夹,但是它现在不是文件夹</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 不可读。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已移除。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已下载。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 已更名为 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已移动至 %2。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 同步出错。详情请查看日志。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>同步活动</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>无法读取系统排除的文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>新文件夹 %2 添加成功,大于 %1 MB。
请前往设置选择是否下载。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,22 +700,22 @@ Are you sure you want to perform this operation?</source>
你确定执行该操作吗?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>删除所有文件?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>删除所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>保持所有文件</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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>
@@ -724,17 +724,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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation>备份已删除</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation>正常同步</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation>保留本地文件为冲突文件</translation>
</message>
@@ -742,112 +742,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>不能重置文件夹状态</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>一个旧的同步日志 &apos;%1&apos; 被找到,但是不能被移除。请确定没有应用程序正在使用它。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation> (备份)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation> (备份 %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>未知状态。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>等待启动同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>准备同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>同步正在运行。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>最后一次同步成功。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>上次同步已成功,不过一些文件出现了警告。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>安装失败</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>用户撤销。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>同步已暂停。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步已暂停)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>没有选择有效的文件夹!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>选择的路径不是一个文件夹!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>你没有写入所选文件夹的权限!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>本地文件夹 %1 是正在使用的同步文件夹,请选择另一个!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地文件夹 %1 包含有正在使用的同步文件夹,请选择另一个!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>选择的文件夹 %1 是一个符号连接,连接指向的是正在使用的同步文件夹,请选择另一个!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地文件夹 %1 是正在使用的同步文件夹,请选择另一个!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>选择的文件夹 %1 是一个符号连接,连接指向的是正在使用的同步文件夹,请选择另一个!</translation>
</message>
@@ -2560,7 +2560,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>共享给 %1</translation>
diff --git a/translations/client_zh_TW.ts b/translations/client_zh_TW.ts
index f32e06c0e..6a09c81d8 100644
--- a/translations/client_zh_TW.ts
+++ b/translations/client_zh_TW.ts
@@ -290,37 +290,37 @@
<context>
<name>OCC::AccountState</name>
<message>
- <location filename="../src/gui/accountstate.cpp" line="109"/>
+ <location filename="../src/gui/accountstate.cpp" line="112"/>
<source>Signed out</source>
<translation>已登出</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="111"/>
+ <location filename="../src/gui/accountstate.cpp" line="114"/>
<source>Disconnected</source>
<translation>已經離線</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="113"/>
+ <location filename="../src/gui/accountstate.cpp" line="116"/>
<source>Connected</source>
<translation>已連線</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="115"/>
+ <location filename="../src/gui/accountstate.cpp" line="118"/>
<source>Service unavailable</source>
<translation>服務無法使用</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="117"/>
+ <location filename="../src/gui/accountstate.cpp" line="120"/>
<source>Network error</source>
<translation>網路異常</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="119"/>
+ <location filename="../src/gui/accountstate.cpp" line="122"/>
<source>Configuration error</source>
<translation>設定錯誤</translation>
</message>
<message>
- <location filename="../src/gui/accountstate.cpp" line="121"/>
+ <location filename="../src/gui/accountstate.cpp" line="124"/>
<source>Unknown account state</source>
<translation>未知的帳號狀態</translation>
</message>
@@ -579,119 +579,119 @@
<context>
<name>OCC::Folder</name>
<message>
- <location filename="../src/gui/folder.cpp" line="134"/>
+ <location filename="../src/gui/folder.cpp" line="135"/>
<source>Local folder %1 does not exist.</source>
<translation>本地資料夾 %1 不存在</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="137"/>
+ <location filename="../src/gui/folder.cpp" line="138"/>
<source>%1 should be a folder but is not.</source>
<translation>資料夾不存在, %1 必須是資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="140"/>
+ <location filename="../src/gui/folder.cpp" line="141"/>
<source>%1 is not readable.</source>
<translation>%1 是不可讀的</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="384"/>
+ <location filename="../src/gui/folder.cpp" line="386"/>
<source>%1: %2</source>
<extracomment>this displays an error string (%2) for a file %1</extracomment>
<translation>%1: %2</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="494"/>
+ <location filename="../src/gui/folder.cpp" line="496"/>
<source>%1 has been removed.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被移除。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="501"/>
+ <location filename="../src/gui/folder.cpp" line="503"/>
<source>%1 has been downloaded.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被下載。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="508"/>
+ <location filename="../src/gui/folder.cpp" line="510"/>
<source>%1 has been updated.</source>
<comment>%1 names a file.</comment>
<translation>%1 已被更新。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="515"/>
+ <location filename="../src/gui/folder.cpp" line="517"/>
<source>%1 has been renamed to %2.</source>
<comment>%1 and %2 name files.</comment>
<translation>%1 已被重新命名為 %2。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="522"/>
+ <location filename="../src/gui/folder.cpp" line="524"/>
<source>%1 has been moved to %2.</source>
<translation>%1 已被搬移至 %2。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="492"/>
+ <location filename="../src/gui/folder.cpp" line="494"/>
<source>%1 and %n other file(s) have been removed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="499"/>
+ <location filename="../src/gui/folder.cpp" line="501"/>
<source>%1 and %n other file(s) have been downloaded.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="506"/>
+ <location filename="../src/gui/folder.cpp" line="508"/>
<source>%1 and %n other file(s) have been updated.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="513"/>
+ <location filename="../src/gui/folder.cpp" line="515"/>
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="520"/>
+ <location filename="../src/gui/folder.cpp" line="522"/>
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="527"/>
+ <location filename="../src/gui/folder.cpp" line="529"/>
<source>%1 has and %n other file(s) have sync conflicts.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="529"/>
+ <location filename="../src/gui/folder.cpp" line="531"/>
<source>%1 has a sync conflict. Please check the conflict file!</source>
<translation type="unfinished"/>
</message>
<message numerus="yes">
- <location filename="../src/gui/folder.cpp" line="534"/>
+ <location filename="../src/gui/folder.cpp" line="536"/>
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
<translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="536"/>
+ <location filename="../src/gui/folder.cpp" line="538"/>
<source>%1 could not be synced due to an error. See the log for details.</source>
<translation>%1 因為錯誤無法被同步。請從紀錄檔觀看細節。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="542"/>
+ <location filename="../src/gui/folder.cpp" line="544"/>
<source>Sync Activity</source>
<translation>同步活動</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="747"/>
+ <location filename="../src/gui/folder.cpp" line="750"/>
<source>Could not read system exclude file</source>
<translation>無法讀取系統的排除檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="958"/>
+ <location filename="../src/gui/folder.cpp" line="961"/>
<source>A new folder larger than %1 MB has been added: %2.
Please go in the settings to select it if you wish to download it.</source>
<translation>一個大於 %1 MB 的資料夾已經新增至: %2.
如果您想要下載它的話,請至設定中選取。</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="976"/>
+ <location filename="../src/gui/folder.cpp" line="979"/>
<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>
@@ -700,39 +700,39 @@ Are you sure you want to perform this operation?</source>
您確定要執行這項動作?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="980"/>
+ <location filename="../src/gui/folder.cpp" line="983"/>
<source>Remove All Files?</source>
<translation>移除所有檔案?</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="982"/>
+ <location filename="../src/gui/folder.cpp" line="985"/>
<source>Remove all files</source>
<translation>移除所有檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="983"/>
+ <location filename="../src/gui/folder.cpp" line="986"/>
<source>Keep files</source>
<translation>保留檔案</translation>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1001"/>
+ <location filename="../src/gui/folder.cpp" line="1004"/>
<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="1006"/>
+ <location filename="../src/gui/folder.cpp" line="1009"/>
<source>Backup detected</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1008"/>
+ <location filename="../src/gui/folder.cpp" line="1011"/>
<source>Normal Synchronisation</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/folder.cpp" line="1009"/>
+ <location filename="../src/gui/folder.cpp" line="1012"/>
<source>Keep Local Files as Conflict</source>
<translation type="unfinished"/>
</message>
@@ -740,112 +740,112 @@ Continuing the sync as normal will cause all your files to be overwritten by an
<context>
<name>OCC::FolderMan</name>
<message>
- <location filename="../src/gui/folderman.cpp" line="264"/>
+ <location filename="../src/gui/folderman.cpp" line="265"/>
<source>Could not reset folder state</source>
<translation>無法重置資料夾狀態</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="265"/>
+ <location filename="../src/gui/folderman.cpp" line="266"/>
<source>An old sync journal &apos;%1&apos; was found, but could not be removed. Please make sure that no application is currently using it.</source>
<translation>發現較舊的同步處理日誌&apos;%1&apos;,但無法移除。請確認沒有應用程式正在使用它。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="913"/>
+ <location filename="../src/gui/folderman.cpp" line="926"/>
<source> (backup)</source>
<translation>(備份)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="918"/>
+ <location filename="../src/gui/folderman.cpp" line="931"/>
<source> (backup %1)</source>
<translation>(備份 %1)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1125"/>
+ <location filename="../src/gui/folderman.cpp" line="1138"/>
<source>Undefined State.</source>
<translation>未知狀態</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1128"/>
+ <location filename="../src/gui/folderman.cpp" line="1141"/>
<source>Waiting to start syncing.</source>
<translation>正在等待同步開始</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1131"/>
+ <location filename="../src/gui/folderman.cpp" line="1144"/>
<source>Preparing for sync.</source>
<translation>正在準備同步。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1134"/>
+ <location filename="../src/gui/folderman.cpp" line="1147"/>
<source>Sync is running.</source>
<translation>同步執行中</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1137"/>
+ <location filename="../src/gui/folderman.cpp" line="1150"/>
<source>Last Sync was successful.</source>
<translation>最後一次同步成功</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1142"/>
+ <location filename="../src/gui/folderman.cpp" line="1155"/>
<source>Last Sync was successful, but with warnings on individual files.</source>
<translation>最新一次的同步已經成功,但是有部份檔案有問題</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1145"/>
+ <location filename="../src/gui/folderman.cpp" line="1158"/>
<source>Setup Error.</source>
<translation>安裝失敗</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1148"/>
+ <location filename="../src/gui/folderman.cpp" line="1161"/>
<source>User Abort.</source>
<translation>使用者中斷。</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1151"/>
+ <location filename="../src/gui/folderman.cpp" line="1164"/>
<source>Sync is paused.</source>
<translation>同步已暫停</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1157"/>
+ <location filename="../src/gui/folderman.cpp" line="1170"/>
<source>%1 (Sync is paused)</source>
<translation>%1 (同步暫停)</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1165"/>
+ <location filename="../src/gui/folderman.cpp" line="1178"/>
<source>No valid folder selected!</source>
<translation>沒有選擇有效的資料夾</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1176"/>
+ <location filename="../src/gui/folderman.cpp" line="1189"/>
<source>The selected path is not a folder!</source>
<translation>所選的路徑並非資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1180"/>
+ <location filename="../src/gui/folderman.cpp" line="1193"/>
<source>You have no permission to write to the selected folder!</source>
<translation>您沒有權限來寫入被選取的資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1195"/>
+ <location filename="../src/gui/folderman.cpp" line="1208"/>
<source>The local folder %1 is already used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 已經被資料夾同步功能使用,請選擇其他資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1200"/>
+ <location filename="../src/gui/folderman.cpp" line="1213"/>
<source>The local folder %1 already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 裡已經有被資料夾同步功能使用的資料夾,請選擇其他資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1207"/>
+ <location filename="../src/gui/folderman.cpp" line="1220"/>
<source>The local folder %1 is a symbolic link. The link target already contains a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 是一個捷徑,此資料夾裡已經有被資料夾同步功能使用的資料夾,請選擇其他資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1214"/>
+ <location filename="../src/gui/folderman.cpp" line="1227"/>
<source>The local folder %1 is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 是被包含在一個已經被資料夾同步功能使用的資料夾,請選擇其他資料夾!</translation>
</message>
<message>
- <location filename="../src/gui/folderman.cpp" line="1220"/>
+ <location filename="../src/gui/folderman.cpp" line="1233"/>
<source>The local folder %1 is a symbolic link. The link target is already contained in a folder used in a folder sync connection. Please pick another one!</source>
<translation>本地資料夾 %1 是一個捷徑,此捷徑的目標是被包含在一個已經被資料夾同步功能使用的資料夾,請選擇其他資料夾!</translation>
</message>
@@ -2561,7 +2561,7 @@ It is not advisable to use it.</source>
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="436"/>
+ <location filename="../src/gui/socketapi.cpp" line="441"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>與 %1 分享</translation>