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:
authorownClouders <devops@owncloud.com>2019-10-26 04:33:37 +0300
committerownClouders <devops@owncloud.com>2019-10-26 04:33:37 +0300
commit54e374c66456760f4bd396aaeeb99074be0ee2ec (patch)
tree842603deadd9c2d32cadf8b0a8d490d3452c8230 /translations
parent5a32554e49eda44faffe2e6152d07bd284e3e141 (diff)
[tx] updated client translations from transifex
Diffstat (limited to 'translations')
-rw-r--r--translations/client_cs.ts500
-rw-r--r--translations/client_de.ts502
-rw-r--r--translations/client_el.ts500
-rw-r--r--translations/client_en.ts14
-rw-r--r--translations/client_es.ts500
-rw-r--r--translations/client_fa.ts500
-rw-r--r--translations/client_fr.ts577
-rw-r--r--translations/client_gl.ts514
-rw-r--r--translations/client_it.ts560
-rw-r--r--translations/client_ja.ts500
-rw-r--r--translations/client_nb_NO.ts500
-rw-r--r--translations/client_nl.ts500
-rw-r--r--translations/client_pl.ts500
-rw-r--r--translations/client_pt.ts500
-rw-r--r--translations/client_pt_BR.ts533
-rw-r--r--translations/client_ru.ts500
-rw-r--r--translations/client_sl.ts500
-rw-r--r--translations/client_sv.ts500
-rw-r--r--translations/client_th.ts540
-rw-r--r--translations/client_tr.ts500
-rw-r--r--translations/client_zh_CN.ts500
21 files changed, 4787 insertions, 5453 deletions
diff --git a/translations/client_cs.ts b/translations/client_cs.ts
index 6507ffe82..f45eb9bef 100644
--- a/translations/client_cs.ts
+++ b/translations/client_cs.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Zrušit</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Připojen k &lt;server&gt; jako &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Žádný účet nenastaven.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Přidat nový</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Odebrat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Účet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Vybrat co sesynchronizovat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Vynutit synchronizaci nyní</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Restartovat synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Odstranit připojení synchronizace adresáře</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Vytvoření adresáře selhalo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Nelze vytvořit místní adresář &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potvrdit odstranění připojení synchronizace adresáře</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstranit připojení synchronizace adresáře</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -288,168 +288,168 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation>Zakázat podporu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Synchronizace probíhá</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Operace synchronizace právě probíhá.&lt;br/&gt;Přejete si ji ukončit?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 používaný</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 jako &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Připojeno k %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 je dočasně nedostupný.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>server %1 je v režimu údržby.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Odhlášeno z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Připojeno k %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Bez připojení k %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Přihlásit</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Tyto složky nebyly synchronizovány, protože jsou příšliš velké:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Tyto složky nebyly synchronizovány, protože se nachází na externím úložišti:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Tyto složky nebyly synchronizovány, protože jsou příliš velké, nebo se nachází na externím úložišti:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Potvrdit odstranění účtu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Opravdu chcete odstranit připojení k účtu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Toto &lt;b&gt;neodstraní&lt;/b&gt; žádné soubory.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Odstranit připojení</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Otevřít adresář</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Odhlásit se</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation>Otevřít místní složku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation>Otevřít složku v prohlížeči</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Pokračovat v synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Pozastavit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation>Dostupnost</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Opravdu chcete zastavit synchronizaci adresáře &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Poznámka:&lt;/b&gt; Toto &lt;b&gt;neodstraní&lt;/b&gt; žádné soubory.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>Používaných %1 (%3%) z %2. Některé adresáře včetně připojených síťových nebo sdílených adresářů mohou mít odlišné limity.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>Používaných %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Momentálně nejsou k dispozici žádné informace o využití úložiště.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Žádné spojení s %1 nenastaveno.</translation>
</message>
@@ -600,24 +600,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;Účet %1 nemá zapnuté aktivity.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Dostali jste %n nové upozornění od %2.</numerusform><numerusform>Dostali jste %n nové upozornění od %2.</numerusform><numerusform>Dostali jste %n nových upozornění od %2.</numerusform><numerusform>Dostali jste %n nových upozornění od %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Dostali jste %n nové upozornění od %1 a %2.</numerusform><numerusform>Dostali jste %n nové upozornění od %1 a %2.</numerusform><numerusform>Dostali jste %n nových upozornění od %1 a %2.</numerusform><numerusform>Dostali jste %n nových upozornění od %1 a %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Dostali jste nové upozornění od %1, %2 a dalších uživatelů.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Upozornění - Vyžadována akce</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,8 +773,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -782,27 +782,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation>Adresář nenalezen: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Kódování znaků jména soubor je neplatné</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation>Chyba při čtení adresáře %1</translation>
</message>
@@ -2228,12 +2228,12 @@ Nedoporučuje se jí používat.</translation>
<translation>&amp;Následující &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>Neplatná URL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Není možné načíst certifikát. Je zadáno správné heslo?</translation>
</message>
@@ -2246,144 +2246,139 @@ Nedoporučuje se jí používat.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Úspěšně připojeno k %1: %2 verze %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Selhalo spojení s %1 v %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Vypršení časového limitu při pokusu o připojení k %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Pokouším se připojit k %1 na %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>Ověřený požadavek na server byl přesměrován na &apos;%1&apos;. URL je špatně, server není správně nakonfigurován.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Byla obdržena nesprávná odpověď na ověřený webdav požadavek</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Přístup zamítnut serverem. Pro ověření správných přístupových práv &lt;a href=&quot;%1&quot;&gt;klikněte sem&lt;/a&gt; a otevřete službu ve svém prohlížeči.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>Neplatná URL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>Server oznámil následující chybu:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Místní synchronizovaný adresář %1 již existuje, nastavuji jej pro synchronizaci.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Vytvářím místní adresář pro synchronizaci %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>selhalo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Nelze vytvořit místní adresář %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Není nastaven žádný vzdálený adresář!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Chyba: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>vytvářím adresář na ownCloudu: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Vzdálený adresář %1 byl úspěšně vytvořen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Vzdálený adresář %1 již existuje. Spojuji jej pro synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Vytvoření adresáře selhalo s HTTP chybou %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;br/&gt;Vraťte se prosím zpět a zkontrolujte je.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Vytvoření vzdáleného adresáře selhalo, pravděpodobně z důvodu neplatných přihlašovacích údajů.&lt;/font&gt;&lt;br/&gt;Vraťte se prosím zpět a zkontrolujte je.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Vytváření vzdáleného adresáře %1 selhalo s chybou &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Bylo nastaveno synchronizované spojení z %1 do vzdáleného adresáře %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Úspěšně spojeno s %1.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Spojení s %1 nelze navázat. Prosím zkuste to znovu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Přejmenování adresáře selhalo</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Nelze odstranit a zazálohovat adresář, protože adresář nebo soubor v něm je otevřen v jiném programu. Prosím zavřete adresář nebo soubor a zkuste znovu nebo zrušte akci.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Místní synchronizovaný adresář %1 byl úspěšně vytvořen!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2473,137 +2468,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolické odkazy nejsou při synchronizaci podporovány.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Soubor se nachází na seznamu ignorovaných.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Jména souborů končících tečkou nejsou na tomto systému souborů podporována.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Názvy souborů obsahující znak &apos;%1&apos; nejsou na tomto souborovém systému podporovány.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Jméno souboru obsahuje alespoň jeden neplatný znak</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Jméno souboru je na tomto systému souborů rezervovaným jménem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Jméno souboru obsahuje mezery na konci řádky.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Jméno souboru je příliš dlouhé.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Soubor/adresář je ignorován, protože je skrytý.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Stat selhal.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation>velikost</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation>práva</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation>etag</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation>id souboru</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranění není povoleno, obnovuji</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorováno podle nastavení &quot;vybrat co synchronizovat&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Není povoleno, protože nemáte oprávnění přidávat podadresáře do tohoto adresáře</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Není povoleno, protože nemáte oprávnění přidávat soubory do tohoto adresáře</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Není povoleno nahrát tento soubor, protože je na serveru uložen pouze pro čtení, obnovuji</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2749,7 +2744,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Server vrátil neplatný HTTP kód. Očekáván 201, ale obdržen &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Chyba zápisu metadat do databáze</translation>
</message>
@@ -2921,17 +2916,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Místní protokol synchronizace</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Kopie</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopírovat záznam aktivity do schránky.</translation>
</message>
@@ -3027,51 +3022,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Nastavení</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Aktivita</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Hlavní</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Síť</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Účet</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Aktivita</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Hlavní</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Síť</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Účet</translation>
</message>
@@ -3415,133 +3381,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Sdílet s %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation>Potvrdit smazání</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation>Opravdu si přejete trvale odstranit soubor &lt;i&gt;%1&lt;/i&gt;?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation>Vybrat nové umístění...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Chyba</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Sdílet...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Odeslat soukromý odkaz emailem...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>Sdílení tohoto odkazu není dovoleno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation>Sdílení této složky není dovoleno</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Zkopírovat veřejný odkaz do schránky</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Otevřít v prohlížeči</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation>Zobrazit verze souboru v prohlížeči</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation>Přejmenovat...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation>Přejmenovat a nahrát...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation>Přesunout a přejmenovat...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation>Přesunout, přejmenovat a nahrát...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation>Smazat místní změny</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation>Přesunout a nahrát...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Smazat</translation>
</message>
@@ -3759,58 +3725,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Je dostupných pouze %1, pro spuštění je potřeba alespoň %2</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Nevyřešený konflikt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Nelze načíst blacklist z místní databáze</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Nelze číst ze žurnálu synchronizace.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Nelze otevřít synchronizační žurnál</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Zrušeno</translation>
</message>
@@ -3852,17 +3818,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>Hlavička kontrolního součtu je poškozena.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Hlavička kontrolního součtu obsahovala neznámý typ součtu &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Stažený soubor neodpovídá kontrolnímu součtu, bude znovu stažen.</translation>
</message>
@@ -3906,243 +3872,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Přihlašte se prosím</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Adresář %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Nejsou nastaveny žádné adresáře pro synchronizaci.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Otevřít v prohlížeči</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Přihlásit...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Odhlásit se</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Poslední změny</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Spravované adresáře:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Otevřít adresář &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Otevřít %1 v prohlížeči</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Neznámý stav</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Nastavení...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Podrobnosti...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Ukončit %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Odpojeno od %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Nepodporovaná verze serveru</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Odpojeno</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Odpojeno od účtů:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Účet %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Odhlášeno</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>Synchronizace účtu je vypnuta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>Synchronizace je pozastavena</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Chyba při synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Spustit všechny adresáře</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Pozastavit všechny adresáře</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Spustit veškerou synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Spustit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Pozastavit veškerou synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Pozastavit synchronizaci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Odhlásit ze všech účtů</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Přihlásit ke všem účtům...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nový účet...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>O %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Žádné položky nebyly nedávno synchronizovány</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Zjišťuji změny ve vzdáleném &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Zjišťuji změny v místním &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronizuji %1 ze %2 (zbývá %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Synchronizace %1 z %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronizuji %1 (zbývá %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Synchronizuji %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Aktuální</translation>
</message>
diff --git a/translations/client_de.ts b/translations/client_de.ts
index cfbb0e9af..c3b09c9ca 100644
--- a/translations/client_de.ts
+++ b/translations/client_de.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Abbrechen</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Verbunden mit &lt;server&gt; als &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Kein Konto konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Neues Konto hinzufügen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Benutzerkonto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Zu synchronisierende Elemente auswählen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Synchronisation jetzt erzwingen </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Synchronisation neustarten</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Ordner-Synchronisation entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation>Unterstützung für virtuelle Dateien einschalten %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation>(Tech-Vorschau)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation>(Experimentell)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Anlegen des Ordners fehlgeschlagen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Konnte lokalen Ordner &lt;i&gt;%1&lt;/i&gt; nicht anlegen.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bestätigen Sie die Löschung der Ordner-Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Ordner-Synchronisation entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation>Deaktiviere Unterstützung für virtuelle Dateien?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -292,168 +292,168 @@ Der einzige Vorteil durch das Abschalten der Unterstützung für virtuelle Datei
Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation>Unterstützung abschalten</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Synchronisation läuft</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Die Synchronisation läuft gerade.&lt;br/&gt;Wollen Sie sie beenden?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 wird verwendet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 als &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Verbunden mit %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 ist derzeit nicht verfügbar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Server %1 befindet sich im Wartungsmodus.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Abgemeldet von %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Berechtigung vom Browser einholen. &lt;a href=&apos;%1&apos;&gt; Hier klicken &lt;/a&gt; zum nochmaligen Öffnen des Browsers.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Verbinde mit %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Keine Verbindung zu %1 auf %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Einloggen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Einige Verzeichnisse konnten nicht synchronisiert werden, da sie zu groß sind:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da diese externe Speicher sind:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Es gibt Verzeichnisse, die nicht synchronisiert werden konnten, da diese zu groß oder externe Speicher sind:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Konto wirklich entfernen?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Wollen Sie wirklich die Verbindung zum Konto &lt;i&gt;%1&lt;/i&gt; lösen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anmerkung:&lt;/b&gt; Dieser Vorgang wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Verbindung entfernen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Ordner öffnen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Abmelden</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation>Öffne lokalen Ordner</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation>Ordner im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Synchronisation fortsetzen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Synchronisation pausieren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation>Verfügbarkeit</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation>Deaktiviere Unterstützung für virtuelle Dateien ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Möchten Sie den Ordner &lt;i&gt;%1&lt;/i&gt; wirklich nicht mehr synchronisieren?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Anmerkung:&lt;/b&gt; Dies wird &lt;b&gt;keine&lt;/b&gt; Dateien löschen.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) von %2 Serverkapazität verwendet. Einige Ordner, einschließlich über das Netzwerk verbundene oder freigegebene Ordner oder geteilte Ordner können unterschiedliche Beschränkungen aufweisen. </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 von %2 Serverkapazität verwendet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Derzeit sind keine Speichernutzungsinformationen verfügbar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>Die Serverversion %1 ist nicht unterstützt! Fortfahren auf eigenes Risiko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Keine %1-Verbindung konfiguriert.</translation>
</message>
@@ -604,24 +604,24 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation>
<translation>&lt;br/&gt;Für Konto %1 sind serverseitig keine Aktivitäten aktiviert.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Sie haben %n neue Benachrichtigung von %2 erhalten.</numerusform><numerusform>Sie haben %n neue Benachrichtigungen von %2 erhalten.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Sie haben %n neue Benachrichtigung von %1 und %2 erhalten.</numerusform><numerusform>Sie haben %n neue Benachrichtigungen von %1 und %2 erhalten.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Sie haben %n neue Benachrichtigungen von %1, %2 und anderen Konten erhalten.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Benachrichtigungen - Handlung notwendig</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -777,8 +777,8 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Server Fehler: Die PROPFIND Antwort ist nicht XML formattiert!</translation>
</message>
@@ -786,27 +786,27 @@ Diese Aktion wird gerade laufende Synchronisationen abbrechen.</translation>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation>Fehler beim Öffnen des Ordners %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Der Ordner ist auf dem Client nicht erreichbar, Zugriff verweigert</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation>Ordner nicht gefunden: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Dateikodierung ist ungültig</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation>Fehler beim Lesen des Ordners %1</translation>
</message>
@@ -2243,12 +2243,12 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>&amp;Weiter &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>Ungültige URL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Zertifikat kann nicht geladen werden. Falsches Passwort?</translation>
</message>
@@ -2261,144 +2261,139 @@ Es ist nicht ratsam, diese zu benutzen.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Erfolgreich mit %1 verbunden: %2 Version %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Die Verbindung zu %1 auf %2:&lt;br/&gt;%3 konnte nicht hergestellt werden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Zeitüberschreitung beim Verbindungsversuch mit %1 unter %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Verbindungsversuch mit %1 unter %2…</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>Die Authentifizierungs-Anfrage an den Server wurde weitergeleitet an &apos;%1&apos;. Diese Adresse ist ungültig, der Server ist falsch konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Es gab eine ungültige Reaktion auf eine WebDav-Authentifizierungs-Anfrage</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Zugang vom Server nicht erlaubt. &lt;a href=&quot;%1&quot;&gt;Klicken Sie hier&lt;/a&gt; zum Zugriff auf den Dienst mithilfe Ihres Browsers, so dass Sie sicherstellen können, dass Ihr Zugang ordnungsgemäß funktioniert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>Ungültige URL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>Der Server meldete folgenden Fehler:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Lokaler Sync-Ordner %1 existiert bereits, aktiviere Synchronistation.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Lokaler Synchronisations-Ordner %1 wird erstellt ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Der lokale Ordner %1 konnte nicht angelegt werden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Keinen entfernten Ordner angegeben!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Fehler: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>erstelle Ordner auf ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Remoteordner %1 erfolgreich erstellt.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Der Ordner %1 ist auf dem Server bereits vorhanden. Verbinde zur Synchronisation.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Das Erstellen des Verzeichnisses erzeugte den HTTP-Fehler-Code %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>Die Remote-Ordner-Erstellung ist fehlgeschlagen, weil die angegebenen Zugangsdaten falsch sind. Bitte gehen Sie zurück und überprüfen Sie die Zugangsdaten.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Die Remote-Ordner-Erstellung ist fehlgeschlagen, vermutlich sind die angegebenen Zugangsdaten falsch.&lt;/font&gt;&lt;br/&gt;Bitte gehen Sie zurück und überprüfen Sie Ihre Zugangsdaten.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Remote-Ordner %1 konnte mit folgendem Fehler nicht erstellt werden: &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Eine Synchronisationsverbindung für Ordner %1 zum entfernten Ordner %2 wurde eingerichtet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Erfolgreich verbunden mit %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Die Verbindung zu %1 konnte nicht hergestellt werden. Bitte prüfen Sie die Einstellungen erneut.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Ordner umbenennen fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Der Ordner kann nicht entfernt und gesichert werden, da der Ordner oder einer seiner Dateien in einem anderen Programm geöffnet ist. Bitte schließen Sie den Ordner oder die Datei oder beenden Sie die Installation.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Lokaler Sync-Ordner %1 erfolgreich erstellt!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2494,137 +2489,137 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolische Verknüpfungen werden bei der Synchronisation nicht unterstützt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Die Datei ist in der Ignorierliste geführt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Dateinamen die mit einem Punkt enden sind in diesem Dateisystem nicht unterstützt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Dateinamen beinhalten das Zeichen &apos;%1&apos; diese werden in diesem Dateisystem nicht unterstützt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Der Dateiname enthält mindestens ein ungültiges Zeichen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Der Dateiname ist ein reservierter Name in diesem Dateisystem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Der Dateiname endet mit Leerzeichen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Der Dateiname ist zu lang.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Datei wird ignoriert, weil sie versteckt ist.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Stat fehlgeschlagen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Konflikt: Serverversion heruntergeladen, lokale Kopie umbenannt und nicht hochgeladen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>Der Dateiname kann auf Ihrem Dateisystem nicht entschlüsselt werden.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation>Der Dateiname ist auf der schwarzen Liste des Servers.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation>Die Datei hat eine Endung, die für virtuelle Dateien reserviert ist.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation>Größe</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation>Berechtigungen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation>E-Tag</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation>file id</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation>Der Server meldet kein %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
- <translation type="unfinished"/>
+ <translation>An ungültigen Zielort verschoben, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Löschen nicht erlaubt, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Aufgrund der »Zu synchronisierende Elemente auswählen«-Sperrliste ignoriert</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zur Erstellung von Unterordnern haben</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Nicht erlaubt, da Sie keine Rechte zum Hinzufügen von Dateien in diesen Ordner haben</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Das Hochladen dieser Datei ist nicht erlaubt, da die Datei auf dem Server schreibgeschützt ist, Wiederherstellung</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation>Fehler beim Lesen der Datenbank</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation>Der Server meldet einen Fehler beim Lesen des Ordners &apos;%1&apos; : %2</translation>
</message>
@@ -2770,7 +2765,7 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<translation>Es wurde ein falscher HTTP-Status-Code vom Server gesendet. Erwartet wurde 201, aber gesendet wurde &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Fehler beim Schreiben der Metadaten in die Datenbank</translation>
</message>
@@ -2942,17 +2937,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<translation>Größe</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Lokales Sychronisationsprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Kopieren</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Aktivitätsliste in die Zwischenablage kopieren.</translation>
</message>
@@ -3048,51 +3043,22 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
- <source>Activity</source>
- <translation>Aktivität</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
- <source>General</source>
- <translation>Allgemein</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
- <source>Network</source>
- <translation>Netzwerk</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Benutzerkonto</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Aktivität</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Allgemein</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Netzwerk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Benutzerkonto</translation>
</message>
@@ -3436,48 +3402,48 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Via %1 teilen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation>Teilen über das Kontextmenü</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation>Freigabe %1 über das Kontextmenü</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation>Löschung bestätigen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation>Möchten Sie den Ordner &lt;i&gt;%1&lt;/i&gt; und alle seine Inhalte dauerhaft löschen?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation>Möchten Sie die Datei &lt;i&gt;%1&lt;/i&gt; dauerhaft löschen?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation>Neuen Ort wählen...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Fehler</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
@@ -3486,85 +3452,85 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
%1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>Ich habe etwas mit Ihnen geteilt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Teilen…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Privater Link in die Zwischenablage kopiert</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Sende privaten Link per Email...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>Weiter-Teilen dieser Datei ist nicht erlaubt.</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation>Weiterteilen des Ordners ist nicht erlaubt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Öffentlichen Link in die Zwischenablage kopieren</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation>Zeige Dateiversionen im Browser</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation>Umbenennen...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation>Umbenennen und hochladen...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation>Verschieben und umbenennen...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation>Verschieben, umbenennen und hochladen...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation>Lokale Änderungen löschen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation>Verschieben und hochladen...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
@@ -3782,58 +3748,58 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<translation>%1 (Übersprungen aufgrund des früheren Fehlers, erneuter Versuch in %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Nur %1 sind verfügbar. Zum Beginnen werden mindestens %2 benötigt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Öffnen oder Erstellen der Sync-Datenbank nicht möglich. Bitte sicherstellen, dass Schreibrechte für den zu synchronisierenden Ordner existieren.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>Der freie Speicherplatz wird knapp: Downloads, die den freien Speicher unter %1 senken, wurden ausgelassen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>Auf dem Server ist für einige Dateien zum Hochladen nicht genug Platz.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Ungelöster Konflikt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation>Metadaten der virtuellen Datei konnten nicht aktualisiert werden: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Virtuelle Dateien mit Dateiendung werden genutzt, aber die Dateiendung ist nicht definiert</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Fehler beim Einlesen der Blacklist aus der lokalen Datenbank</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Fehler beim Einlesen des Synchronisierungsprotokolls.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Synchronisationsbericht kann nicht geöffnet werden</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Abgebrochen</translation>
</message>
@@ -3875,17 +3841,17 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>Der Prüfsummen-Header hat ein fehlerhaftes Format.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Die Prüfsummen-Kopfzeile enthielt den unbekannten Prüfsummentypen &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Die heruntergeladene Datei entspricht nicht der Prüfsumme, das Herunterladen wird wiederaufgenommen.</translation>
</message>
@@ -3929,243 +3895,243 @@ Dies ist ein neuer, experimenteller Modus. Wenn sie sich dafür entscheiden, ber
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Bitte melden Sie sich an</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Ordner %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Es wurden keine Synchonisationsordner konfiguriert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Einloggen...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Abmelden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Letzte Änderungen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Verwaltete Ordner:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Ordner »%1« öffnen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>%1 im Browser öffnen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Der Server mit Konto %1 läuft mit einer nicht unterstützten Version %2. Die Verwendung dieses Clienten mit nicht unterstützten Serverversionen ist ungetestet und möglicherweise gefährlich. Fortfahren auf eigenes Risiko.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Unbekannter Status</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Einstellungen …</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Details …</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>%1 beenden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Von %1 trennen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>nicht unterstützte Server Version</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Getrennt</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>Die Verbindungen zu einigen Konten wurde getrennt</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Verbindungen zu Konten wurde getrennt:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Abgemeldet</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>Account Synchronisation ist deaktiviert</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>Synchronisation pausiert</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>Ungelöste Konflikte</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Fehler bei der Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Keine Ordner zur Synchronisation konfiguriert</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Setze alle Ordner fort</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Stoppe alle Ordner</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Setze gesamte Synchronisation fort</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Setze Synchronisation fort</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Stoppe gesamte Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Stoppe Synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Bei allen Konten abmelden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Bei allen Konten anmelden...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Neues Konto...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>Über %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Keine kürzlich synchronisierten Elemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Änderungen der entfernten Ressource &apos;%1&apos; werden geprüft</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Änderungen der lokalen Ressource &apos;%1&apos; werden geprüft</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronisiere %1 von %2 (%3 übrig)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Synchronisiere %1 von %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronisiere %1 (%2 übrig)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Synchronisiere %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Aktuell</translation>
</message>
diff --git a/translations/client_el.ts b/translations/client_el.ts
index a0090cb96..8c8c0ffb9 100644
--- a/translations/client_el.ts
+++ b/translations/client_el.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Άκυρο</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Συνδεδεμένοι με το &lt;server&gt; ως &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Δεν ρυθμίστηκε λογαριασμός.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Προσθήκη νέου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Αφαίρεση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Λογαριασμός</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Επιλέξτε τι θα συγχρονιστεί</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Εξαναγκασμός συγχρονισμού τώρα</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Επανεκκίνηση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Αποτυχία αφαίρεσης φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Αδυναμία δημιουργίας τοπικού φακέλου &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Επιβεβαίωση αφαίρεσης σύνδεσης συγχρονισμού φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Αφαίρεση σύνδεσης συγχρονισμού φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation>Απενεργοποίηση υποστήριξης εικονικού αρχείου;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -292,168 +292,168 @@ This action will abort any currently running synchronization.</source>
Αυτή η ενέργεια θα ακυρώσει οποιονδήποτε τρέχοντα συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation>Απενεργοποίηση υποστήριξης</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Εκτελείται Συγχρονισμός </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Η λειτουργία συγχρονισμού εκτελείται.&lt;br/&gt; Θέλετε να την τερματίσετε;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 σε χρήση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 ως &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Συνδεδεμένο με %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Ο διακομιστής %1 δεν είναι διαθέσιμος προσωρινά.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Ο διακομιστής %1 είναι προς το παρόν σε κατάσταση συντήρησης.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Αποσυνδέθηκε από %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Γίνεται εύρεση πιστοποίησης από τον περιηγητή. &lt;a href=&apos;%1&apos;&gt;Κάντε κλικ εδώ&lt;/a&gt; για να ανοίξετε ξανά τον περιηγητή.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Σύνδεση σε %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Δεν υπάρχει σύνδεση με το %1 στο %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Είσοδος</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Υπάρχουν φάκελοι που δεν συγχρονίστηκαν επειδή είναι πολύ μεγάλοι:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Υπάρχουν φάκελοι που δεν συγχρονίστηκαν επειδή είναι εξωτερικοί αποθηκευτικοί χώροι:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Υπάρχουν φάκελοι που δεν συγχρονίστηκαν επειδή είναι πολύ μεγάλοι ή αποθηκευτικοί χώροι:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Επιβεβαίωση Αφαίρεσης Λογαριασμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Θέλετε πραγματικά να αφαιρέσετε τη σύνδεση με το λογαριασμό &lt;i&gt;%1&lt;/i&gt;;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτό &lt;b&gt;δεν&lt;/b&gt; θα διαγράψει κανένα αρχείο.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Αφαίρεση σύνδεσης</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Άνοιγμα φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation>Άνοιγμα τοπικού φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation>Άνοιγμα φακέλου στον περιηγητή</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Συνέχιση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Παύση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation>Διαθεσιμότητα</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation>Απενεργοποίηση υποστήριξης εικονικού αρχείου...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Θέλετε πραγματικά να σταματήσετε το συγχρονισμό του φακέλου &lt;i&gt;%1&lt;/i&gt;;&lt;/p&gt;&lt;p&gt;&lt;b&gt;Σημείωση:&lt;/b&gt; Αυτό &lt;b&gt;δεν&lt;/b&gt; θα διαγράψει κανένα αρχείο.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) από %2 σε χρήση. Μερικοί φάκελοι, συμπεριλαμβανομένων των δικτυακών ή των κοινόχρηστων μπορεί να έχουν διαφορετικά όρια.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 από %2 σε χρήση</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Προς το παρόν δεν υπάρχουν πληροφορίες χρήσης χώρου αποθήκευσης διαθέσιμες.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>Η έκδοση διακομιστή %1 δεν υποστηρίζεται! Προχωρήστε με δική σας ευθύνη.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Δεν έχει ρυθμιστεί σύνδεση με το %1.</translation>
</message>
@@ -604,24 +604,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;Ο λογαριασμός %1 δεν έχει ενεργοποιήσει τις δραστηριότητες.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Λάβατε %n νέα ειδοποίηση(σεις) από %2.</numerusform><numerusform>Λάβατε %n νέα ειδοποίηση(σεις) από %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Λάβατε %n νέες ειδοποιήση(εις) από %1 και %2.</numerusform><numerusform>Λάβατε %n νέες ειδοποιήση(εις) από %1 και %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Λάβατε νέες ανακοινώσεις από %1, %2 και άλλους λογαριασμούς.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Ειδοποιήσεις - Απαιτείται ενέργεια</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -777,8 +777,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Σφάλμα διακομιστή: Η απάντηση PROPFIND δεν έχει μορφοποιηθεί με XML!</translation>
</message>
@@ -786,27 +786,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation>Σφάλμα κατά το άνοιγμα του καταλόγου %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Ο κατάλογος δεν είναι προσβάσιμος από τον πελάτη, άρνηση πρόσβασης</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation>Δεν βρέθηκε ο κατάλογος: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Η κωδικοποίηση του ονόματος αρχείου δεν είναι έγκυρη</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation>Σφάλμα κατά την ανάγνωση του καταλόγου %1</translation>
</message>
@@ -2245,12 +2245,12 @@ It is not advisable to use it.</source>
<translation>&amp;Επόμενο &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>Μη έγκυρη URL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Αδυναμία φόρτωσης πιστοποιητικού. Ίσως είναι εσφαλμένο το συνθηματικό;</translation>
</message>
@@ -2263,144 +2263,139 @@ It is not advisable to use it.</source>
<translation>&lt;font color=&quot;green&quot;&gt;Επιτυχής σύνδεση στο %1: %2 έκδοση %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Αποτυχία σύνδεσης με το %1 στο %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Λήξη χρονικού ορίου κατά τη σύνδεση σε %1 σε %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Προσπάθεια σύνδεσης στο %1 για %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>Η πιστοποιημένη αίτηση στον διακομιστή ανακατευθύνθηκε σε &apos;%1&apos;. Το URL είναι εσφαλμένο, ο διακομιστής δεν έχει διαμορφωθεί σωστά.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Υπήρξε μια άκυρη απόκριση σε μια πιστοποιημένη αίτηση </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Απαγόρευση πρόσβασης από τον διακομιστή. Για να επιβεβαιώσετε ότι έχετε δικαιώματα πρόσβασης, &lt;a href=&quot;%1&quot;&gt;πατήστε εδώ&lt;/a&gt; για να προσπελάσετε την υπηρεσία με το πρόγραμμα πλοήγησής σας.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>Μη έγκυρη URL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>Ο διακομιστής ανέφερε το παρακάτω σφάλμα:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Ο τοπικός φάκελος συγχρονισμού %1 υπάρχει ήδη, ρύθμιση για συγχρονισμό.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Δημιουργία τοπικού φακέλου συγχρονισμού %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>οκ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>απέτυχε.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Αδυναμία δημιουργίας τοπικού φακέλου %1 </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Δεν προσδιορίστηκε κανένας απομακρυσμένος φάκελος!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Σφάλμα: %1 </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>δημιουργία φακέλου στο ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Ο απομακρυσμένος φάκελος %1 δημιουργήθηκε με επιτυχία.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Ο απομακρυσμένος φάκελος %1 υπάρχει ήδη. Θα συνδεθεί για συγχρονισμό. </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Η δημιουργία φακέλου είχε ως αποτέλεσμα τον κωδικό σφάλματος HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>Η δημιουργία απομακρυσμένου φακέλλου απέτυχε επειδή τα διαπιστευτήρια είναι λάθος!&lt;br/&gt;Παρακαλώ επιστρέψετε και ελέγξετε τα διαπιστευτήριά σας.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Η δημιουργία απομακρυσμένου φακέλου απέτυχε, πιθανώς επειδή τα διαπιστευτήρια που δόθηκαν είναι λάθος.&lt;/font&gt;&lt;br/&gt;Παρακαλώ επιστρέψτε πίσω και ελέγξτε τα διαπιστευτήρια σας.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Η δημιουργία απομακρυσμένου φακέλου %1 απέτυχε με σφάλμα &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Μια σύνδεση συγχρονισμού από τον απομακρυσμένο κατάλογο %1 σε %2 έχει ρυθμιστεί. </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Επιτυχής σύνδεση με %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Αδυναμία σύνδεσης στον %1. Παρακαλώ ελέξτε ξανά.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Αποτυχία μετονομασίας φακέλου</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Αδυναμία αφαίρεσης και δημιουργίας αντιγράφου ασφαλείας του φακέλου διότι ο φάκελος ή ένα αρχείο του είναι ανοικτό από άλλο πρόγραμμα. Παρακαλώ κλείστε τον φάκελο ή το αρχείο και πατήστε επανάληψη ή ακυρώστε την ρύθμιση.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Επιτυχής δημιουργία τοπικού φακέλου %1 για συγχρονισμό!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2496,137 +2491,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Οι συμβολικού σύνδεσμοι δεν υποστηρίζονται για το συγχρονισμό.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Το αρχείο περιέχεται στη λίστα αρχείων προς αγνόηση.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Τα ονόματα αρχείων που διαρκούν μια ορισμένη χρονική περίοδο δεν υποστηρίζονται σε αυτό το σύστημα αρχείων.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Τα ονόματα αρχείων που περιέχουν τον χαρακτήρα &apos;% 1&apos; δεν υποστηρίζονται σε αυτό το σύστημα αρχείων.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Το όνομα αρχείου περιέχει τουλάχιστο ένα μη έγκυρο χαρακτήρα</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Το όνομα αρχείου είναι ένα κατοχυρωμένο όνομα σε αυτό το σύστημα αρχείων.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Το όνομα του αρχείου περιέχει συνεχόμενα κενά.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Το όνομα αρχείου είνια πολύ μεγάλο.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Το Αρχείο/ο Φάκελος αγνοήθηκε επειδή είναι κρυφό.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Απέτυχε.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Σύγκρουση: Έγινε λήψη της έκδοσης του διακομιστή, το τοπικό αντίγραφο μετονομάστηκε και δεν μεταφορτώθηκε.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>Το όνομα αρχείου δεν μπορεί να κωδικοποιηθεί στο σύστημα αρχείων σας.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation>Το όνομα αρχείου είναι στην μαύρη λίστα του διακομιστή.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation>Το αρχείο έχει επέκταση που προορίζεται για εικονικά αρχεία.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation>μέγεθος</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation>δικαιώματα</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation>ηλεκτρονική ετικέτα</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation>id αρχείου</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation>ο διακομιστής ανέφερε όχι %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Δεν επιτρέπεται η αφαίρεση, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Αγνοήθηκε εξαιτίας της μαύρης λίστας &quot;διάλεξε τι να συγχρονιστεί&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε υποφακέλους σε αυτό τον φάκελο</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Δεν επιτρέπεται επειδή δεν έχετε δικαιώματα να προσθέσετε αρχεία σε αυτόν τον φάκελο</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Δεν επιτρέπεται να μεταφορτώσετε αυτό το αρχείο επειδή είναι μόνο για ανάγνωση στο διακομιστή, αποκατάσταση σε εξέλιξη</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation>Σφάλμα κατά την ανάγνωση της βάσης δεδομένων</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation>Ο διακομιστής απάντησε με σφάλμα κατά την ανάγνωση του καταλόγου &apos;%1&apos; : %2</translation>
</message>
@@ -2772,7 +2767,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ο διακομιστής επέστρεψε εσφαλμένο κωδικό HTTP. Αναμενόταν 201, αλλά ελήφθη &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Σφάλμα εγγραφής μεταδεδομένων στην βάση δεδομένων</translation>
</message>
@@ -2944,17 +2939,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Μέγεθος</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Πρωτόκολλο τοπικού συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Αντιγραφή</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Αντιγραφή της λίστας δραστηριότητας στο πρόχειρο.</translation>
</message>
@@ -3050,51 +3045,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ρυθμίσεις</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Δραστηριότητα</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Γενικά</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Δίκτυο</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Λογαριασμός</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Δραστηριότητα</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Γενικά</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Δίκτυο</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Λογαριασμός</translation>
</message>
@@ -3438,48 +3404,48 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Διαμοιρασμός με %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation>Μενού περιβάλλοντος κοινόχρηστου</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation>Μενού περιβάλλοντος κοινόχρηστου %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation>Επιβεβαίωση διαγραφής</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation>Θέλετε να διαγράψετε μονίμως τον κατάλογο &lt;i&gt;%1&lt;/i&gt; και όλα τα περιεχόμενά του;</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation>Θέλετε να διαγράψετε οριστικά το αρχείο &lt;i&gt;%1&lt;/i&gt;;</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation>Επιλογή νέας τοποθεσίας...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Σφάλμα</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
@@ -3488,85 +3454,85 @@ This is a new, experimental mode. If you decide to use it, please report any iss
%1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>Διαμοιράστηκα κάτι μαζί σου</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Διαμοιρασμός</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Αντιγραφή ιδιωτικού συνδέσμου στο πρόχειρο</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Αποστολή ιδιωτικού συνδέσμου με αλληλογραφία...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>Δεν επιτρέπεται να διαμοιράσετε ξανά αυτό το αρχείο</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation>Δεν επιτρέπεται να διαμοιράσετε ξανά αυτόν τον φάκελο</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Αντιγραφή δημόσιου συνδέσμου στο πρόχειρο</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Άνοιγμα στον περιηγητή ιστού</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation>Εμφάνιση εκδόσεων αρχείου στον περιηγητή</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation>Μετονομασία...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation>Μετονομασία και μεταφόρτωση...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation>Μετακίνηση και μετονομασία...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation>Μετακίνηση, μετονομασία και μεταφόρτωση...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation>Διαγραφή τοπικών αλλαγών</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation>Μετακίνηση και μεταφόρτωση...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Διαγραφή</translation>
</message>
@@ -3784,58 +3750,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 (έχει παραλειφθεί λόγω προηγούμενου σφάλματος, θα γίνει προσπάθεια ξανά σε %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Μόνο %1 είναι διαθέσιμα, απαιτούνται τουλάχιστον %2 για την εκκίνηση</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Δεν είναι δυνατό το άνοιγμα ή η δημιουργία της τοπικής βάσης δεδομένων συγχρονισμού. Βεβαιωθείτε ότι έχετε πρόσβαση εγγραφής στο φάκελο συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>Ο χώρος στο δίσκο είναι χαμηλός: Λήψεις που θα μειώσουν τον ελεύθερο χώρο κάτω από το %1 έχουν παραβλεφθεί.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>Ανεπαρκής διαθέσιμος χώρος στο διακομιστή για κάποιες μεταφορτώσεις.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Ανεπίλυτη σύγκρουση.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation>Δεν ήταν δυνατή η ενημέρωση των μεταδεδομένων εικονικού αρχείου: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Γίνεται χρήση εικονικών αρχεία με κατάληξη, αλλά η κατάληξη δεν έχει οριστεί</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Αδυναμία ανάγνωσης της μαύρης λίστας από την τοπική βάση δεδομένων</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Αδυναμία ανάγνωσης από το ημερολόγιο συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Αδυναμία ανοίγματος του αρχείου συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Ματαιώθηκε</translation>
</message>
@@ -3877,17 +3843,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>Η κεφαλίδα του αθροίσματος ελέγχου δεν είναι σωστά διαμορφωμένη.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Το checksum header περιέχει άγνωστο τύπο checksum &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Το αρχείο που μεταφορτώθηκε δεν επαληθεύει το άθροισμα ελέγχου, θα συγχρονιστεί πάλι.</translation>
</message>
@@ -3931,243 +3897,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Παρκαλώ συνδεθείτε</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Φάκελος %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Δεν έχουν ρυθμιστεί φάκελοι συγχρονισμού.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Άνοιγμα στον περιηγητή ιστού</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Σύνδεση...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Πρόσφατες Αλλαγές</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Φάκελοι υπό Διαχείριση:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Άνοιγμα φακέλου &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Άνοιγμα %1 στον περιηγητή</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Ο διακομιστής στο λογαριασμό %1 εκτελεί μια μη υποστηριζόμενη έκδοση %2. Η χρήση αυτού του πελάτη με μη υποστηριζόμενες εκδόσεις διακομιστών δεν είναι δοκιμασμένη και δυνητικά επικίνδυνη. Προχωρήστε με δική σας ευθύνη.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Άγνωστη κατάσταση</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Ρυθμίσεις...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Λεπτομέρειες...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Βοήθεια</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Κλείσιμο %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Αποσυνδέθηκε από %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Μη υποστηριζόμενη έκδοση διακομιστή</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Αποσυνδεδεμένο</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>Έγινε αποσύνδεση από μερικούς λογαριασμούς</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Αποσυνδέθηκε από τους λογαριασμούς:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Λογαριασμός %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Αποσύνδεση</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>Ο λογαριασμός συγχρονισμού έχει απενεργοποιηθεί</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>Παύθηκε ο συγχρονισμός</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>Ανεπίλυτες συγκρούσεις</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Σφάλμα κατά τον συγχρονισμό</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Δεν ρυθμίστηκαν φάκελοι συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Αναίρεση παύσης όλων των φακέλων</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Παύση όλων των φακέλων</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Αναίρεση παύσης όλων των συγχρονισμών</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Αναίρεση παύσης συγχρονσμού</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Παύση όλων των συγχρονισμών</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Παύση συγχρονισμού</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Έξοδος από όλους τους λογαριασμούς</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Είσοδος σε όλους τους λογαριασμούς</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Νέος λογαριασμός...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>Σχετικά %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Κανένα στοιχείο δεν συγχρονίστηκε πρόσφατα</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Έλεγχος για αλλαγές στο απομακρυσμένο &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Έλεγχος για αλλαγές στο τοπικό &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Συγχρονισμός %1 από %2 (%3 απομένουν)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Συγχρονισμός %1 από %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Συγχρονισμός %1 (%2 απομένουν)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Συγχρονισμός %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Ενημερωμένο</translation>
</message>
diff --git a/translations/client_en.ts b/translations/client_en.ts
index 761fcc1ed..62db031ec 100644
--- a/translations/client_en.ts
+++ b/translations/client_en.ts
@@ -602,29 +602,29 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
<translation type="unfinished">
<numerusform></numerusform>
<numerusform></numerusform>
</translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
+ <source>Action required. Open the activity view to react.</source>
<translation type="unfinished"></translation>
</message>
</context>
diff --git a/translations/client_es.ts b/translations/client_es.ts
index cad662945..2c752d757 100644
--- a/translations/client_es.ts
+++ b/translations/client_es.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Conectado a &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>No se ha configurado ninguna cuenta.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Añadir nuevo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Eliminar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Elija qué sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Forzar la sincronización ahora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Reiniciar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Eliminar la sincronización de carpetas conectadas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Hubo un fallo al crear la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;No se pudo crear la carpeta local &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirme la sincronización para la eliminación de la carpeta conectada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Eliminar carpeta de sincronización conectada</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation>Desactivar soporte a archivo virtual?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -292,168 +292,168 @@ La única ventaja de deshabilitar el soporte de archivos virtuales es que la fun
Esta acción abortará cualquier sincronización actualmente en ejecución.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation>Desactivar ayuda</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Sincronización en curso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La sincronización está en curso.&lt;br/&gt;¿Desea interrumpirla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Servidor %1 no está disponible temporalmente.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>El servidor %1 está actualmente en modo mantenimiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Cerró sesión desde %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obteniendo autorización desde el navegador. &lt;a href=&apos;%1&apos;&gt;Haga click aqui&lt;/a&gt; para re-abrir el navegador .</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Conectando a %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Sin conexión a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Iniciar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque residen en almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hay carpetas que no fueron sincronizadas porque son demasiado grandes o residen en almacenamiento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Confirmar eliminación de cuenta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿De verdad quiere eliminar la conexión a la cuenta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; eliminará los archivos.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Eliminar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Abrir carpeta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation>Abrir carpeta local</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation>Abrir carpeta en el navegador de internet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Continuar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Pausar sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation>Disponibilidad</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation>Deshabilitar el soporte de archivos virtuales...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;¿De verdad quiere dejar de sincronizar la carpeta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Esto &lt;b&gt;no&lt;/b&gt; elminará los archivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algunas carpetas, como carpetas de red o compartidas, podrían tener límites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente no hay información disponible sobre el uso de almacenamiento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>¡La versión del servidor %1 no es compatible! Continúa bajo tu responsabilidad.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>No hay ninguna conexión de %1 configurada.</translation>
</message>
@@ -604,24 +604,24 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra
<translation>&lt;br/&gt;La cuenta %1 no tiene actividades habilitadas.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Ha recibido %n nueva notificación de %2.</numerusform><numerusform>Ha recibido %n nueva notificacióne(s) de %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Ha recibido %n nueva notificación de %1 y de %2.</numerusform><numerusform>Ha recibido %n nuevas notificacióne(s) de %1 y de %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Ha recibido nuevas notificaciónes de %1, %2 y otras cuentas.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Notificaciones - Acción requerida</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -777,8 +777,8 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Error en el servidor: la réplica PROPFIND no está en un formato XML!</translation>
</message>
@@ -786,27 +786,27 @@ Esta acción abortará cualquier sincronización actualmente en ejecución.</tra
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation>Error durante la apertura de la carpeta %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Directorio no accesible en el cliente, permiso denegado</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation>No se encuentra carpeta: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Los caracteres del nombre de fichero no son válidos</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation>Error durante la lectura del directorio %1</translation>
</message>
@@ -2244,12 +2244,12 @@ No se recomienda usarla.</translation>
<translation>&amp;Siguiente &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>URL inválida.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>No se pudo cargar el certificado. ¿Quizás contraseña incorrecta?</translation>
</message>
@@ -2262,144 +2262,139 @@ No se recomienda usarla.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Conectado con éxito a %1: versión %2 %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Fallo al conectar %1 a %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Tiempo de espera agotado mientras se intentaba conectar a %1 en %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Intentando conectar a %1 desde %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>La petición autenticada al servidor ha sido redirigida a &apos;%1&apos;. La dirección URL es errónea, el servidor está mal configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Ha habido una respuesta no válida a una solicitud autenticada de webdav</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Acceso denegado por el servidor. Para verificar que usted tiene acceso, &lt;a href=&quot;%1&quot;&gt;haga clic aquí&lt;/a&gt; para acceder al servicio con su navegador.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>URL inválida.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>El servidor informa del siguiente error:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>La carpeta de sincronización local %1 ya existe, configurándola para la sincronización.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Creando carpeta de sincronización local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>bien</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>ha fallado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>No se ha podido crear la carpeta local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>¡No se ha especificado ninguna carpeta remota!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Error: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>creando carpeta en ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Carpeta remota %1 creado correctamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>La carpeta remota %1 ya existe. Conectándola para sincronizacion.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La creación de la carpeta ha producido el código de error HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>¡La creación de la carpeta remota ha fallado debido a que las credenciales proporcionadas son incorrectas!&lt;br/&gt;Por favor, vuelva atrás y compruebe sus credenciales&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;La creación de la carpeta remota ha fallado, probablemente porque las credenciales proporcionadas son incorrectas.&lt;/font&gt;&lt;br/&gt;Por favor, vuelva atrás y compruebe sus credenciales.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Creación %1 de carpeta remota ha fallado con el error &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Se ha configarado una conexión de sincronización desde %1 al directorio remoto %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>¡Conectado con éxito a %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>No se ha podido establecer la conexión con %1. Por favor, compruébelo de nuevo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Error al renombrar la carpeta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>No se puede eliminar y respaldar la carpeta porque la misma o un fichero en ella está abierto por otro programa. Por favor, cierre la carpeta o el fichero y reintente, o cancele la instalación.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Carpeta de sincronización local %1 creada con éxito&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2495,137 +2490,137 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>No se admiten enlaces simbólicos en la sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>El fichero está en la lista de ignorados</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Los nombres de archivo que terminan con un punto no son compatibles con este sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Los nombres de archivo que contengan el caracter &apos;%1&apos; no son compatibles con este sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>El nombre de archivo contiene al menos un carácter no válido</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>El nombre del archivo es una palabra reservada del sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>El nombre del archivo contiene espacios finales.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>El nombre del archivo es demasiado largo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Se ignoran los Archivos/Carpetas ocultos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Stat ha fallado.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflicto: versión del servidor descargada, la copia local ha sido renombrada pero no se ha podido subir.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>El nombre de archivo no se puede codificar en su sistema de archivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation>El nombre del archivo está en la lista negra del servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation>Archivo posee una extensión reservada para los archivos virtuales.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation>tamaño</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation>permisos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation>etag</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation>id de archivo</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation>servidor informó no %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>No está permitido borrar, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorado porque se encuentra en la lista negra de &quot;elija qué va a sincronizar&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>No permitido porque no tiene permiso para añadir subdirectorios a ese directorio</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>No permitido porque no tiene permiso para añadir archivos a ese directorio</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>No está permitido subir este archivo porque es de solo lectura en el servidor, restaurando.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation>Error durante la lectura de la base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation>El servidor respondió con un error al leer el directorio &apos;%1&apos; : %2</translation>
</message>
@@ -2771,7 +2766,7 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<translation>El código HTTP devuelto por el servidor es erróneo. Esperado 201, pero recibido &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Error al escribir los metadatos en la base de datos</translation>
</message>
@@ -2943,17 +2938,17 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Protocolo de sincronización local</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copie la lista de actividades al portapapeles</translation>
</message>
@@ -3049,51 +3044,22 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<translation>Ajustes</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Actividad</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>General</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Red</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Cuenta</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Actividad</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>General</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Red</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Cuenta</translation>
</message>
@@ -3437,48 +3403,48 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Compartir con %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation>Compartido de menu contextual</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation>Menú contextual compartir %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation>Confirmar eliminación</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation>¿Desea eliminar el directorio &lt;i&gt;%1&lt;/i&gt; y todo su contenido permanentemente?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation>¿Desea eliminar el archivo &lt;i&gt;%1&lt;/i&gt; de manera permanente?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation>Seleccionar nueva ubicación...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Error</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
@@ -3487,85 +3453,85 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
%1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>He compartido algo contigo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Compartir...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Copiar enlace privado al portapapeles</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Enviar enlace privado por e-mail...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>No está permitido volver a compartir este archivo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation>Recompartir esta carpeta no está permitido</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Copiar el enlace a la pizarra</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Abrir en navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation>Mostrar las versiones del archivo en el navegador de internet</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation>Renombrar...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation>Renombrar y subir...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation>Mover y renombrar...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation>Mover, renombrar y subir...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation>Eliminar cambios locales</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation>Mover y subir...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Eliminar</translation>
</message>
@@ -3783,58 +3749,58 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<translation>%1 (no realizado por el error anterior, intente de nuevo %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Solo %1 disponible, se necesita por lo menos %2 para comenzar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Imposible abrir o crear la base de datos local de sincronización. Asegúrese de que tiene permisos de escritura en la carpeta de sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>Poco espacio libre en disco: La descarga lo reducirá por debajo del %1, debería abortar.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>No hay suficiente espacio libre en el servidor para algunas subidas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Conflicto sin resolver.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation>No se pudo actualizar los metadatos del archivo virtual: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Usando archivos virtuales con sufijo, pero el mismo no está establecido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>No se pudo leer la lista de bloqueo de la base de datos local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>No se ha podido leer desde el registro de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>No es posible abrir el diario de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Interrumpido</translation>
</message>
@@ -3876,17 +3842,17 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>La cabecera del archivo de comprobación es incorrecto.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>La suma de comprobación de cabeceras contenía una suma de comprobación desconocida de tipo &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>El archivo descargado no coincide con el archivo de comprobación, será reanudado.</translation>
</message>
@@ -3930,243 +3896,243 @@ Este es un nuevo modo experimental. Si decide utilizarlo, reporte cualquier prob
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Por favor, regístrese</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Archivo %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>No hay carpetas configuradas para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Abrir en navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Inicio de sesión...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Cambios recientes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Carpetas administradas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Abrir carpeta &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 en el navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>El servidor de la cuenta %1 ejecuta una versión %2 no compatible. Este cliente con versiones del servidor no compatibles es potencialmente peligroso. Continúa bajo tu responsabilidad.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Estado desconocido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Configuraciones...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Salir de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Versión del servidor no soportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado desde varias cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado desde cuentas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Cuenta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Cerrar sesión</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>La sincronización está deshabilitada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>La sincronización se ha detenido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>Conflictos sin resolver</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Error durante la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>No hay carpetas sincronizado configuradas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Reanudar todas las carpetas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Pausar todas las carpetas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Reanudar toda la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Reanudar la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Pausar todas las sincronizaciones</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Pausar la sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Terminar sessión en todas las cuentas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Iniciar sesión en todas las cuentas...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nueva cuenta ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>Acerca de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>No se han sincronizado elementos recientemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Buscando cambios en remoto: &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Buscando cambios en local &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizando %1 de %2 (quedan %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (quedan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
diff --git a/translations/client_fa.ts b/translations/client_fa.ts
index e1baf2d15..bf1f0df7d 100644
--- a/translations/client_fa.ts
+++ b/translations/client_fa.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>منصرف شدن</translation>
</message>
@@ -199,87 +199,87 @@
<translation>متصل به &lt;server&gt; به عنوان &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>هیچ حساب‌کاربری‌ای تنظیم نشده‌ است.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>اضافه کردن جدید</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>حذف</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>حساب کاربری</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>انتخاب موارد همگام‌سازی</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>راه اندازی مجدد همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>حذف اتصال همگام سازی پوشه </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>ساخت پوشه ناموفق</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;ناتوانی در ساخت پوشه محلی &lt;i&gt;1%&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>تأیید حذف اتصال همگام سازی پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>حذف اتصال همگام سازی پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -288,168 +288,168 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>همگام سازی در حال اجراست</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>عملیات همگام سازی در حال اجراست.&lt;br/&gt;آیا دوست دارید آن را متوقف کنید؟</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>1% در استفاده</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>1% به عنوان &lt;i&gt;2%&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>متصل به %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>سرور %1 بصورت موقت خارج از دسترس است.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>سرور 1% اکنون در حالت تعمیر است.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>از 1% خارج شد.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>دریافت مجوز از مرورگر. &lt;a href=&apos;%1&apos;&gt;اینجا کلیک کنید&lt;/a&gt; تا مرورگر دوباره باز شود.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>اتصال به %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>اتصال به 1% در 2% وجود ندارد.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>ورود</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>پوشه‌هایی وجود دارند که همگام سازی نشده اند زیرا آن ها بسیار بزرگ هستند:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>پوشه‌هایی وجود دارند که همگام سازی نشده اند زیرا آن ها مخازن خارجی هستند:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>پوشه‌هایی وجود دارند که همگام سازی نشده اند زیرا آن ها بسیار بزرگ یا مخازن خارجی هستند:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>تائید حذف حساب‌کاربری</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;آیا شما واقعا می خواهید اتصال به حساب &lt;i&gt;1%&lt;/i&gt;را حذف کنید؟&lt;/p&gt; &lt;p&gt;&lt;b&gt;توجه:&lt;/b&gt; این هیچ فایلی را حذف نخواهد کرد.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>حذف ارتباط</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>بازکردن پوشه</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>خروج</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>از سر‎گیری همگام‌سازی</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>توقف به‌هنگام‌سازی </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;آیا شما واقعا می خواهید همگام سازی پوشه &lt;i&gt;1%&lt;/i&gt; را متوقف نمایید؟&lt;/p&gt;&lt;p&gt;&lt;b&gt;توجه:&lt;/b&gt;این هیچ فایلی را حذف &lt;b&gt;نخواهد&lt;/b&gt; کرد. &lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>1% (%3%) از 2% در استفاده. برخی پوشه‌ها، شامل شبکه نصب شده یا پوشه های مشترک، ممکن است محدودیت های متفاوت داشته باشند.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>1% از 2% در استفاده</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>در حال حاضر هیچ اطلاعات کاربرد ذخیره سازی در دسترس نیست.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>بدون %1 اتصال پیکربندی شده.</translation>
</message>
@@ -600,24 +600,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;فعالیت های حساب 1% فعال نیست.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>شما n% هشدار جدید از 2% دریافت کردید.</numerusform><numerusform>شما n% هشدار جدید از 2% دریافت کردید.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>شما n% هشدار جدید از 1% و 2% دریافت کردید.</numerusform><numerusform>شما n% هشدار جدید از 1% و 2% دریافت کردید.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>شما هشدارهای جدیدی از 1%، 2% و سایر حساب ها دریافت کردید.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>1% هشدارها - عمل لازم</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,8 +773,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -782,27 +782,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>رمزگذاری نام فایل معتبر نیست</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -2229,12 +2229,12 @@ It is not advisable to use it.</source>
<translation>&amp;بعدی&gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>آدرس نامعتبر</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"/>
</message>
@@ -2247,144 +2247,139 @@ It is not advisable to use it.</source>
<translation>&lt;font color=&quot;green&quot;&gt; با موفقیت متصل شده است به %1: %2 نسخه %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>ارتباط ناموفق با %1 در %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>هنگام تلاش برای اتصال به 1% در 2% زمان به پایان رسید.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>تلاش برای اتصال %1 به %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>درخواست تایید شده به سرور &apos;1%&apos; هدایت شد. آدرس بد است، سرور اشتباه پیکربندی شده است.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>یک پاسخ نادرست به درخواست webdov تایید شده وجود داشت</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>دسترسی توسط سرور ممنوع شد. برای تأیید اینکه شما دسترسی مناسب دارید، &lt;a href=&quot;%1&quot;&gt;اینجا را کلیک کنید &lt;/a&gt; تا با مرورگر خود به سرویس دسترسی پیدا کنید.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>آدرس نامعتبر</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>سرور خطای زیر را گزارش کرد:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>پوشه همگام سازی محلی %1 در حال حاضر موجود است، تنظیم آن برای همگام سازی. &lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>ساخت پوشه همگام سازی محلی 1%...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>خوب</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>ناموفق.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>نمی تواند پوشه محلی ایجاد کند %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>هیچ پوشه از راه دوری مشخص نشده است!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>خطا: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>ایجاد کردن پوشه بر روی ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>پوشه از راه دور %1 با موفقیت ایجاد شده است.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>در حال حاضر پوشه از راه دور %1 موجود است. برای همگام سازی به آن متصل شوید.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>ایجاد پوشه به خطای HTTP کد 1% منجر شد</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>ایجاد پوشه از راه دور ناموفق بود به علت اینکه اعتبارهای ارائه شده اشتباه هستند!&lt;br/&gt;لطفا اعتبارهای خودتان را بررسی کنید.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt; ایجاد پوشه از راه دور ناموفق بود، شاید به علت اعتبارهایی که ارئه شده اند، اشتباه هستند.&lt;/font&gt;&lt;br/&gt; لطفا باز گردید و اعتبار خود را بررسی کنید.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>ایجاد پوشه از راه دور %1 ناموفق بود با خطا &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>یک اتصال همگام سازی از %1 تا %2 پوشه از راه دور راه اندازی شد.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>با موفقیت به %1 اتصال یافت!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>اتصال به %1 نمی تواند مقرر باشد. لطفا دوباره بررسی کنید.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>تغییر نام پوشه ناموفق بود</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>نمی توانید پوشه را حذف کنید یا پشتیبان بگیرید زیرا پوشه یا یک پرونده در آن در برنامه دیگری باز است. لطفا پوشه یا پرونده را ببندید و مجددا تلاش کنید یا تنظیم را لغو کنید.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt; پوشه همگام سازی محلی %1 با موفقیت ساخته شده است!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2474,137 +2469,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>پیوندهای نمادین در همگام سازی پشتیبانی نمی شوند.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>پرونده در فهرست رد شده ها موجود است.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>نام پرونده هایی که با دوره ای پایان می یابند در این سیستم پرونده پشتیبانی نشده اند.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>نام پرونده هایی که شامل کاراکتر &apos;1%&apos; هستند در این سیستم پرونده پشتیبانی نشده اند.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>نام فایل دارای حداقل یک کاراکتر نامعتبر است</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>نام پرونده یک نام رزرو شده در این سیستم پرونده است.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>نام پرونده شامل دنباله فضای خالی است.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>نام فایل خیلی طولانی است.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>پرونده/پوشه رد شد زیرا مخفی است.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>وضعیت ناموفق</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>ناسازگاری: نسخه سرور دانلود شد، کپی محلی تغییر نام داده شده و بارگذاری نشده است.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>نام پرونده در سیستم پرونده شما رمزگذاری نمی شود.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>حذف مجاز نیست، در حال بازگردادن</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>به علت لیست سیاه &quot;انتخاب کنید چه چیزی همگام سازی شود&quot; رد شد</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>با توجه به عدم اجازه‌ی شما به ایجاد زیرپوشه به پوشه مجاز نیست</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>مجاز نیستید زیرا شما اجازه افزودن پرونده به آن پوشه را ندارید</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>آپلود این فایل با توجه به فقط-خواندنی بودن آن در سرور مجاز نیست، در حال بازگرداندن</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2750,7 +2745,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>کد HTTP اشتباه توسط سرور برگردانده شد. 201 انتظار می رفت، اما &quot;1% 2%&quot; دریافت شد.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>خطا در نوشتن متادیتا در پایگاه داده</translation>
</message>
@@ -2922,17 +2917,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>اندازه</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>پروتکل همگام سازی محلی</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>کپی کردن</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>فهرست فعالیت را در کلیپ بورد کپی کنید.</translation>
</message>
@@ -3028,51 +3023,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>تنظیمات</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>فعالیت</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>عمومی</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>شبکه</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>حساب کاربری</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>فعالیت</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>عمومی</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>شبکه</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>حساب کاربری</translation>
</message>
@@ -3416,133 +3382,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>اشتراک‌گذاری با %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>خطا</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>من چیزی را با شما به اشتراک گذاشتم</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>اشتراک گذاری...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>لینک خصوصی را در کلیپ بورد کپی کنید</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>لینک خصوصی را پست الکترونیکی ارسال کنید...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>باز کردن در مرورگر</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>حذف</translation>
</message>
@@ -3759,58 +3725,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>1% (به علت خطای قبلی از بین رفته است، دوباره در 2% امتحان کنید)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>تنها 1% موجود است، حداقل 2% برای شروع مورد نیاز است</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>پایگاه داده محلی باز یا ساخته نمی شود. اطمینان حاصل کنید که دسترسی به نوشتن در پوشه همگام سازی دارید.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>فضای دیسک کم است: دانلودهایی که فضای آزاد را به کمتر از 1% کاهش می دهند رد می شوند.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>برای بعضی از بارگذاری ها در سرور فضای کافی موجود نیست.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>ناسازگاری حل نشده.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>نمی توان لیست سیاه را از پایگاه داده محلی خواند</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>نمی توان از مجله همگام ساز خواند.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>نمی توان مجله همگام ساز را باز کرد</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation type="unfinished"/>
</message>
@@ -3852,17 +3818,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>سرتیتر checksum نادرست است.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>سرتیتر checksum شامل یک checksum نوع &apos;1%&apos; ناشناخته است</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>پرونده دانلود شده با checksum مطابق نیست، این ادامه خواهد یافت.</translation>
</message>
@@ -3906,243 +3872,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>لطفا وارد شوید</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>پوشه %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>هیچ پوشه‌ای برای همگام‌سازی تنظیم نشده است.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>باز کردن در مرورگر</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>ورود...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>خروج</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>تغییرات اخیر</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>پوشه های مدیریت شده:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>بازکردن پوشه‌ی &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>1% را در مرورگر باز کنید</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>وضعیت نامعلوم</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>تنظیمات...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>جزئیات...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>راه‌نما</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>خروج %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>قطع‌شده از %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>نسخه سرور پشتیبانی نشده </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>قطع شده</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>قطع شده از برخی حساب ها</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>قطع شده از حساب ها:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>حساب‌کاربری %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>خارج شد</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>همگام سازی حساب غیر فعال است</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>همگام سازی متوقف شده است</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>خطا حین همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>هیچ پوشه‌ همگام سازی پیکربندی شده</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>شروع مجدد تمام پوشه‌ها</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>توقف تمام پوشه‌ها</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>شروع مجدد تمام همگام سازی ها</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>شروع مجدد همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>توقف تمام همگام سازی ها</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>توقف همگام سازی</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>خروج از تمام حساب ها</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>ورود به تمام حساب ها...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>حساب جدید...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>درباره %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>هیچ موردی به تازگی همگام‌سازی نشده است</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>همگام‌سازی %1 از%2 (%3 باقیمانده)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>همگام سازی 1% از 2%</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>همگام‌سازی %1 (%2 باقیمانده)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>همگام‌سازی %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>تا تاریخ</translation>
</message>
diff --git a/translations/client_fr.ts b/translations/client_fr.ts
index 4158c9981..72daa048d 100644
--- a/translations/client_fr.ts
+++ b/translations/client_fr.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Annuler</translation>
</message>
@@ -199,257 +199,261 @@
<translation>Connecté au serveur &lt;server&gt; avec le compte &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Aucun compte configuré.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Ajouter un nouveau compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Supprimer</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Sélectionner le contenu à synchroniser</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Forcer la synchronisation maintenant</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Redémarrer la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Supprimer la synchronisation du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(expérimental)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Échec de création du dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Impossible de créer le dossier local &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmer une suppression de synchronisation de dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Supprimer la synchronisation de ce dossier</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
- <translation type="unfinished"/>
+ <translation>Voulez-vous désactiver le support des fichiers virtuels ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation type="unfinished"/>
+ <translation>Cette action va désactiver le support des fichiers virtuels. Le contenu des dossiers marqués comme ’disponible seulement en ligne’ sera donc téléchargé.
+
+Le seul avantage à désactiver le support des fichiers virtuels est que la fonctionnalité de synchronisation sélective sera à nouveau disponible.
+
+Cette action stoppera toute synchronisation en cours.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Synchronisation en cours</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>La synchronisation est en cours.&lt;br/&gt;Voulez-vous l&apos;arrêter ?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 utilisés</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 avec le compte &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Connecté au serveur %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Le serveur %1 est temporairement indisponible.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Le serveur %1 est en cours de maintenance.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Session sur %1 fermée.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>En attente d&apos;autorisation du navigateur. &lt;a href=&apos;%1&apos;&gt;Cliquer ici&lt;/a&gt; pour recharger le navigateur.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Connexion à %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Aucune connexion au serveur %1 à l&apos;adresse %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Se connecter</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Certains dossiers n&apos;ont pas été synchronisés parce qu&apos;ils sont de taille trop importante :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Certains dossiers n&apos;ont pas été synchronisés parce qu&apos;ils sont localisés sur un stockage externe :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Certains dossiers n&apos;ont pas été synchronisés parce qu&apos;ils sont localisés sur un stockage externe ou qu&apos;ils sont de taille trop importante :</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Confirmation de retrait du compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Êtes-vous certain de vouloir retirer &lt;i&gt;%1&lt;/i&gt; des comptes synchronisés avec le serveur ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Remarque :&lt;/b&gt; cela ne supprimera pas votre compte sur le serveur, et aucun fichier ne sera supprimé ni localement ni en ligne.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Retirer le compte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Ouvrir le dossier local</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Se déconnecter</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
- <translation type="unfinished"/>
+ <translation>Ouvrir le dossier local</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Reprendre la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Mettre en pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
- <translation type="unfinished"/>
+ <translation>Disponibilité</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
- <translation type="unfinished"/>
+ <translation>Désactivez le support des fichiers virtuels…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Voulez-vous vraiment arrêter de synchroniser le dossier &lt;i&gt;%1&lt;/i&gt; ?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note :&lt;/b&gt; Aucun fichier ne sera supprimé.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) utilisés sur %2. Certains dossiers, montés depuis le réseau ou partagés, peuvent avoir des limites différentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 utilisés sur %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actuellement aucune information d&apos;utilisation de stockage n&apos;est disponible.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
- <translation type="unfinished"/>
+ <translation>La version %1 du serveur n’est pas supportée. Poursuivez à vos risques et périls.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Aucune connexion à %1 configurée</translation>
</message>
@@ -600,24 +604,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;Le compte %1 n&apos;a aucune activité activée.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Vous avez reçu %n nouvelle notification de %2.</numerusform><numerusform>Vous avez reçu %n nouvelles notifications de %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Vous avez reçu 1 nouvelle notification de %1 et %2.</numerusform><numerusform>Vous avez reçu %n nouvelles notifications de %1 et %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Vous avez reçu de nouvelles notifications de %1, %2 et d&apos;autres comptes.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Notifications - Action Requise</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,38 +777,38 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
- <translation type="unfinished"/>
+ <translation>Erreur du serveur : la réponse PROPFIND n’est pas formatée en XML !</translation>
</message>
</context>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
- <translation type="unfinished"/>
+ <translation>Erreur lors de l’ouverture du répertoire %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
- <translation type="unfinished"/>
+ <translation>Répertoire non accessible depuis le client. Permission refusée</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
- <translation type="unfinished"/>
+ <translation>Répertoire non trouvé : %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>L&apos;encodage du nom de fichier n&apos;est pas valide</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
- <translation type="unfinished"/>
+ <translation>Erreur lors de la lecture du répertoire %1</translation>
</message>
</context>
<context>
@@ -855,13 +859,13 @@ This action will abort any currently running synchronization.</source>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="419"/>
<source>%1 and %n other file(s) have been added.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%1 et %n autre(s) fichier(s) ont été ajouté(s).</numerusform><numerusform>%1 et %n autre(s) fichier(s) ont été ajouté(s).</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="421"/>
<source>%1 has been added.</source>
<comment>%1 names a file.</comment>
- <translation type="unfinished"/>
+ <translation>%1 a été ajouté.</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="426"/>
@@ -1067,7 +1071,7 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<message>
<location filename="../src/gui/folderman.cpp" line="1372"/>
<source>The selected path does not exist!</source>
- <translation type="unfinished"/>
+ <translation>Le chemin sélectionné n’existe pas !</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1376"/>
@@ -1140,7 +1144,7 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="215"/>
<source>Virtual file support is enabled.</source>
- <translation type="unfinished"/>
+ <translation>Le support des fichiers virtuels est activé.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="235"/>
@@ -1373,7 +1377,7 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<message>
<location filename="../src/gui/folderwizard.cpp" line="487"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(expérimental)</translation>
</message>
</context>
<context>
@@ -1757,7 +1761,9 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<source>The client can write debug logs to a temporary folder. These logs are very helpful for diagnosing problems.
Since log files can get large, the client will start a new one for each sync run and compress older ones. It is also recommended to enable deleting log files after a couple of hours to avoid consuming too much disk space.
If enabled, logs will be written to %1</source>
- <translation type="unfinished"/>
+ <translation>Le client peut enregistrer les journaux de diagnostic dans un dossier temporaire. Ces journaux sont très utiles afin de diagnostiquer les problèmes.
+Puisque les fichiers journaux peuvent devenir très lourd, le client en enregistrera un nouveau pour chaque synchronisation et compressera les anciens. Il est aussi recommandé d’activer la suppression des fichiers journaux après quelques heures afin d’éviter de consommer trop d’espace disque.
+Si cette fonction est activée, les journaux seront enregistrés dans %1</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="66"/>
@@ -1767,13 +1773,14 @@ If enabled, logs will be written to %1</source>
<message>
<location filename="../src/gui/logbrowser.cpp" line="72"/>
<source>Delete logs older than %1 hours</source>
- <translation type="unfinished"/>
+ <translation>Supprimer les journaux plus anciens que %1 heures</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="78"/>
<source>These settings persist across client restarts.
Note that using any logging command line options will override the settings.</source>
- <translation type="unfinished"/>
+ <translation>Ces paramètres sont conservés malgré les redémarrages du client.
+Veuillez noter qu’utiliser les options de journalisation en ligne de commande est prioritaire sur ces paramètres.</translation>
</message>
<message>
<location filename="../src/gui/logbrowser.cpp" line="85"/>
@@ -1825,12 +1832,12 @@ Note that using any logging command line options will override the settings.</so
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="441"/>
<source>Update Failed</source>
- <translation type="unfinished"/>
+ <translation>La mise à jour a échoué</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="447"/>
<source>&lt;p&gt;A new version of the %1 Client is available but the updating process failed.&lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; has been downloaded. The installed version is %3.&lt;/p&gt;</source>
- <translation type="unfinished"/>
+ <translation>&lt;p&gt; Une nouvelle version du Client %1 est disponible mais la mise à jour a échoué. &lt;/p&gt;&lt;p&gt;&lt;b&gt;%2&lt;/b&gt; a été téléchargé. La version installée est %3.&lt;/p&gt;</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="461"/>
@@ -1840,12 +1847,12 @@ Note that using any logging command line options will override the settings.</so
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="462"/>
<source>Restart and update</source>
- <translation type="unfinished"/>
+ <translation>Redémarrer et mettre à jour</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="463"/>
<source>Update manually</source>
- <translation type="unfinished"/>
+ <translation>Mettre à jour manuellement</translation>
</message>
</context>
<context>
@@ -2046,17 +2053,17 @@ L&apos;assistant de mise à jour peut vous demandez des autorisations supplémen
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="148"/>
<source>Downloading %1. Please wait...</source>
- <translation type="unfinished"/>
+ <translation>Téléchargement %1 en cours. Veuillez patienter…</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="150"/>
<source>%1 available. Restart application to start the update.</source>
- <translation type="unfinished"/>
+ <translation>%1 disponible. Veuillez redémarrer l’application afin de démarrer la mise à jour.</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="156"/>
<source>New %1 available. Please use the system&apos;s update tool to install it.</source>
- <translation type="unfinished"/>
+ <translation>Nouvel(le) %1 disponible. Veuillez utiliser l’outils de mise à jour système afin de l’installer.</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="158"/>
@@ -2109,7 +2116,7 @@ L&apos;assistant de mise à jour peut vous demandez des autorisations supplémen
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(expérimental)</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
@@ -2237,12 +2244,12 @@ Il est déconseillé de l&apos;utiliser.</translation>
<translation>&amp;Suivant &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>URL invalide</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Impossible de charger le certificat. Peut-être un mauvais mot de passe ?</translation>
</message>
@@ -2255,144 +2262,139 @@ Il est déconseillé de l&apos;utiliser.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Connecté avec succès à %1 : %2 version %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Échec de la connexion à %1 sur %2 :&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Délai d&apos;attente dépassé lors de la connexion à %1 sur %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentative de connexion à %1 sur %2 ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>La requête d&apos;authentification vers le serveur a été redirigée vers &apos;%1&apos;. L&apos;URL est erronée, le serveur est mal configuré.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Une réponse non valide a été reçue suite à une requête WebDav authentifiée.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Accès impossibe. Afin de vérifier l&apos;accès au serveur, &lt;a href=&quot;%1&quot;&gt;cliquez ici&lt;/a&gt; et connectez-vous au service avec votre navigateur web.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>URL invalide</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>Le serveur a renvoyé l&apos;erreur suivante:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Le dossier de synchronisation local %1 existe déjà, configuration de la synchronisation.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Création du dossier local de synchronisation %1... </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>échoué.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Impossible de créer le dossier local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Aucun dossier distant spécifié !</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Erreur : %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>création d&apos;un dossier sur ownCloud : %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Le dossier distant %1 a été créé avec succès.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Le dossier distant %1 existe déjà. Connexion.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La création du dossier a généré le code d&apos;erreur HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>La création du dossier distant a échoué car les identifiants de connexion sont erronés !&lt;br/&gt;Veuillez revenir en arrière et vérifier ces derniers.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;La création du dossier distant a échoué, probablement parce que les informations d&apos;identification fournies sont fausses.&lt;/font&gt;&lt;br/&gt;Veuillez revenir en arrière et les vérifier.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>La création du dossier distant &quot;%1&quot; a échouée avec l&apos;erreur &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Une synchronisation entre le dossier local %1 et le dossier distant %2 a été configurée.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Connecté avec succès à %1 !</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>La connexion à %1 n&apos;a pu être établie. Veuillez réessayer.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Echec du renommage du dossier</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Impossible de supprimer et de sauvegarder le dossier parce que ce dossier ou un de ses fichiers est ouvert dans un autre programme. Veuillez fermer le dossier ou le fichier et ré-essayer, ou annuler l&apos;installation.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Dossier de synchronisation local %1 créé avec succès !&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2482,137 +2484,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Les liens symboliques ne sont pas pris en charge par la synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Le fichier est présent dans la liste des fichiers à exclure.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Les noms de fichier se terminant par un point ne sont pas pris en charge sur votre système.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Les noms de fichier contenant le caractère &apos;%1&apos; ne sont pas pris en charge sur votre système.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Le nom de fichier contient au moins un caractère non valable</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Le nom du fichier est réservé sur votre système.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Le nom du fichier se fini par des espaces.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Le nom de fichier est trop long.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Le fichier ou dossier a été ignoré car il est masqué.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Stat échoué.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflit : La version du serveur a été téléchargée, la version locale renommée et non téléversée.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>Le nom de fichier ne peut pas être encodé sur votre système.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
- <translation type="unfinished"/>
+ <translation>taille</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Non autorisé à supprimer. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignoré en raison de la liste noire &quot;Sélectionner le contenu à synchroniser&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des sous-dossiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Non autorisé car vous n&apos;avez pas la permission d&apos;ajouter des fichiers dans ce dossier</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non autorisé à envoyer ce fichier car il est en lecture seule sur le serveur. Restauration</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
- <translation type="unfinished"/>
+ <translation>Erreur lors de la lecture de la base de données</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2758,7 +2760,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Le code HTTP retourné par le serveur n&apos;est pas valide. La valeur attendue est 201 mais la valeur reçue est &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Erreur à l&apos;écriture des métadonnées dans la base de données</translation>
</message>
@@ -2768,7 +2770,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="142"/>
<source>Could not rename %1 to %2, error: %3</source>
- <translation type="unfinished"/>
+ <translation>Impossible de renommer %1 vers %2, erreur : %3</translation>
</message>
<message>
<location filename="../src/libsync/propagateremotemove.cpp" line="191"/>
@@ -2930,17 +2932,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Taille</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Historique des opérations de synchronisation locale</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Copier</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copier la liste d&apos;activités dans le presse-papier</translation>
</message>
@@ -3036,51 +3038,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Paramètres</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
- <source>Activity</source>
- <translation>Activité</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
- <source>General</source>
- <translation>Paramètres</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
- <source>Network</source>
- <translation>Réseau</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Compte</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Activité</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Paramètres</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Réseau</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Compte</translation>
</message>
@@ -3168,12 +3141,12 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="297"/>
<source>Name:</source>
- <translation type="unfinished"/>
+ <translation>Nom :</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="304"/>
<source>Enter name of new share...</source>
- <translation type="unfinished"/>
+ <translation>Donnez un nom au nouveau partage…</translation>
</message>
<message>
<location filename="../src/gui/sharelinkwidget.ui" line="311"/>
@@ -3425,133 +3398,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Partager avec %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
- <translation type="unfinished"/>
+ <translation>Confirmez la suppression</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
- <translation type="unfinished"/>
+ <translation>Êtes-vous sûr de vouloir supprimer le répertoire &lt;i&gt;%1&lt;/i&gt; et tout son contenu de manière permanente ?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Erreur</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>J&apos;ai partagé quelque chose avec vous</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>partager</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Copier le lien privé vers le presse-papier</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Envoyer le lien privé par courriel...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>Le repartage de ce fichier n&apos;est pas permis</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Copier le lien public dans le presse-papier</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Ouvrir dans le navigateur web</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Supprimer</translation>
</message>
@@ -3769,58 +3742,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 (ignoré à cause d&apos;une précédente erreur, nouvel essai dans %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Seulement %1 disponibles, il faut au moins %2 pour démarrer</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Impossible d&apos;accéder ou de créer une base de données locale de synchronisation. Assurez vous de disposer des droits d&apos;écriture dans le dossier de synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>L&apos;espace disque est faible : les téléchargements qui amèneraient à réduire l&apos;espace libre en dessous de %1 ont été ignorés.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>Il n&apos;y a pas suffisamment d’espace disponible sur le serveur pour certains téléversements.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>conflit non résolu.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Impossible de lire la liste noire de la base de données locale</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Impossible de lire le journal de synchronisation.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Impossible d&apos;ouvrir le journal de synchronisation</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Abandonné</translation>
</message>
@@ -3862,17 +3835,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>L&apos;entête de somme de contrôle est mal formée.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>L&apos;en-tête de la somme de contrôle contenait un type de somme de contrôle inconnu &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Le fichier téléchargé ne correspond pas à la somme de contrôle, il va être téléchargé à nouveau.</translation>
</message>
@@ -3916,243 +3889,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Veuillez vous connecter</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Dossier %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Aucun dossier à synchroniser n&apos;est configuré</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Ouvrir dans le navigateur web</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Connexion...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Se déconnecter</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Modifications récentes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Dossiers configurés</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Ouvrir le dossier local &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Ouvrir %1 dans le navigateur</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Statut inconnu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Paramètres...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Toutes les modifications...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Aide...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Quitter %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Déconnecté de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Version du Serveur non prise en charge</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Déconnecté</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>Déconnecté de certains comptes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Déconnecté des comptes :</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Compte %1 : %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Session fermée</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>La synchronisation est en pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>La synchronisation est en pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>Conflits non résolus</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Erreur durant la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Aucun dossier de synchronisation configuré</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Relancer tous les dossiers </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Mettre en pause tous les dossiers</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Relancer toutes les synchronisations</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Relancer la synchronisation</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Mettre en pause toutes les synchronisations</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Mettre en pause la synchronisation </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Se déconnecter de tous les comptes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Se connecter à tous les comptes...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nouveau compte…</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>À propos de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Aucun élément synchronisé récemment</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Vérification des changements distants &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Vérification des changements locaux &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronisation de %1 sur %2 (%3 restantes)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Synchronisation %1 sur %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronisation de %1 (%2 restantes)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Synchronisation de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>À jour</translation>
</message>
diff --git a/translations/client_gl.ts b/translations/client_gl.ts
index 41bdc3c44..ea3344a35 100644
--- a/translations/client_gl.ts
+++ b/translations/client_gl.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Conectado con &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Non hai contas configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Engadir novo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Retirar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Escolla que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Forzar a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Reiniciar a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Retirar a conexión da sincronización do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation>Activar a compatibilidade con ficheiro virtual %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation>(vista previa técnica)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation>(experimental)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Non foi posíbel crear o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Non foi posíbel crear o cartafol local &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar a retirada da conexión da sincronización do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Retirar a conexión da sincronización do cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation>Desactivar a compatibilidade con ficheiro virtual? </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -292,168 +292,168 @@ A única vantaxe de desactivar a compatibilidade de ficheiros virtuais é que a
Esta acción interromperá calquera sincronización que estea agora en proceso.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation>Desactivar a compatibilidade</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Sincronización en proceso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Estase a realizar a sincronización.&lt;br/&gt;Quere interrompela e rematala?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>O servidor %1 non está dispoñíbel temporalmente.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>O servidor %1 neste momento está en modo de mantemento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Desconectado de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obtendo autorización dende o navegador. &lt;a href=&apos;%1&apos;&gt;Prema aquí&lt;/a&gt; para volver abrir o navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Connectando con %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Non hai conexión con %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Acceder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Hai cartafoles que non se sincronizaron por ser demasiado grandes: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Hai cartafoles que non se sincronizaron porque son almacenamentos externos: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Hai cartafoles que non se sincronizaron porque son demasiado grandes ou almacenamentos externos: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Confirme a retirada da conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;De verdade quere retirar a conexión a conta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Aviso:&lt;/b&gt; Isto &lt;b&gt;non&lt;/b&gt; eliminará ningún ficheiro.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Retirar conexión</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Abrir o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Desconectar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation>Abrir o cartafol local</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation>Abrir o cartafol no navegador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Continuar coa sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Por en pausa a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation>Dispoñíbilidade</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation>Desactivar a compatibilidade con ficheiro virtual…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Quere realmente deixar de sincronizar o cartafol &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Aviso:&lt;/b&gt; Isto &lt;b&gt;non&lt;/b&gt; eliminará ningún ficheiro.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 en uso. Algúns cartafoles, incluíndo os compartidos e os montados en rede, poderían ter diferentes límites.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 en uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Actualmente non hai dispoñíbel ningunha información sobre o uso do almacenamento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>Este servidor da versión %1 non é compatíbel! Continúe baixo a súa responsabilidade.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Non se configurou a conexión %1.</translation>
</message>
@@ -604,24 +604,24 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.<
<translation>&lt;br/&gt;A conta %1 non ten as actividades activadas.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Recibiu unha notificación nova de %s</numerusform><numerusform>Recibiu %n notificacións novas de %s</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Recibiu %unha notificación nova de %1 e %2.</numerusform><numerusform>Recibiu %n notificacións novas de %1 e %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Recibiu notificacións novas de %1, %2 e outras contas.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Notificacións — Requiren unha acción</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -777,8 +777,8 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.<
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Produciuse un erro no servidor: a réplica PROPFIND non está en formato XML!</translation>
</message>
@@ -786,27 +786,27 @@ Esta acción interromperá calquera sincronización que estea agora en proceso.<
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation>Produciuse un erro ao abrir o directorio %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Directorio non accesíbel no cliente, permiso denegado </translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation>Non se atopou o directorio: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>O nome de ficheiro codificado non é correcto</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation>Produciuse un erro ao ler o directorio %1</translation>
</message>
@@ -1001,17 +1001,17 @@ Se fose un accidente e decide manter os seus ficheiros, volverán ser sincroniza
<message>
<location filename="../src/gui/folderman.cpp" line="354"/>
<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 diario de sincronización antigo en «%1» máis non pode ser retirado. Asegúrese de que non o está a usar ningún aplicativo.</translation>
+ <translation>Atopouse un diario 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="1138"/>
<source> (backup)</source>
- <translation>(copia de seguranza)</translation>
+ <translation>(copia de seguridade)</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1143"/>
<source> (backup %1)</source>
- <translation>(copia de seguranza %1)</translation>
+ <translation>(copia de seguridade %1)</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1321"/>
@@ -1583,7 +1583,7 @@ Teña en conta que isto só selecciona a canle desexada e que non hai reversión
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="167"/>
<source>&lt;a href=&quot;%1&quot;&gt;Click here&lt;/a&gt; to request an app password from the web interface.</source>
- <translation>&lt;a href=&quot;%1&quot;&gt;Prema aquí&lt;/a&gt; para solicitar un contrasinal de aplicativo dende a interface web.</translation>
+ <translation>&lt;a href=&quot;%1&quot;&gt;Prema aquí&lt;/a&gt; para solicitar un contrasinal de aplicación dende a interface web.</translation>
</message>
</context>
<context>
@@ -2060,7 +2060,7 @@ actualización pode pedir privilexios adicionais durante o procedemento.</transl
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="150"/>
<source>%1 available. Restart application to start the update.</source>
- <translation>%1 está dispoñíbel. Reinicie o aplicativo para iniciar a actualización. </translation>
+ <translation>%1 está dispoñíbel. Reinicie a aplicación para iniciar a actualización. </translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="156"/>
@@ -2246,12 +2246,12 @@ Recomendámoslle que non o use.</translation>
<translation>&amp;Seguinte &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>URL incorrecto</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Non foi posíbel cargar o certificado. Quizais o contrasinal é incorrecto?</translation>
</message>
@@ -2264,144 +2264,139 @@ Recomendámoslle que non o use.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Conectouse correctamente a %1: %2 versión %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Non foi posíbel conectar con %1 en %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Esgotouse o tempo tentando conectarse a %1 en %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentando conectarse a %1 en %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>A solicitude autenticada no servidor foi redirixida a «%1», O URL é incorrecto, o servidor está mal configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Deuse unha resposta incorrecta a unha solicitude de WebDAV autenticada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Acceso prohibido polo servidor. Para comprobar que dispón do acceso axeitado, &lt;a href=&quot;%1&quot;&gt;prema aquí&lt;/a&gt; para acceder ao servizo co seu navegador.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>URL incorrecto</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>O servidor informou o seguinte erro:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>O cartafol de sincronización local %1 xa existe. Configurándoo para a sincronización.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Creando un cartafol local de sincronización %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>aceptar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>fallou.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Non foi posíbel crear o cartafol local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Non foi especificado o cartafol remoto!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>creando o cartafol en ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>O cartafol remoto %1 creouse correctamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>O cartafol remoto %1 xa existe. Conectándoo para a sincronización.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A creación do cartafol resultou nun código de erro HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>A creación do cartafol remoto fracasou por mor de seren incorrectas as credenciais!&lt;br/&gt;Volva atrás e comprobe as súas credenciais.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;A creación do cartafol remoto fallou probabelmente debido a que as credenciais que se deron non foran as correctas.&lt;/font&gt;&lt;br/&gt;Volva atrás e comprobe as súas credenciais.&lt;/p&gt; </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Produciuse un fallo ao crear o cartafol remoto %1 e dou o erro &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Estabeleceuse a conexión de sincronización de %1 ao directorio remoto %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Conectou satisfactoriamente con %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Non foi posíbel estabelecer a conexión con %1. Compróbeo de novo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Non foi posíbel renomear o cartafol</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
- <translation>Non é posíbel retirar e facer unha copia de seguranza do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e ténteo de novo, ou cancele a acción.</translation>
+ <translation>Non é posíbel retirar e facer unha copia de seguridade do cartafol, xa que o cartafol ou un ficheiro está aberto noutro programa Peche o cartafol ou o ficheiro e ténteo de novo, ou cancele a acción.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;O cartafol local de sincronización %1 creouse correctamente!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2499,137 +2494,137 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>As ligazóns simbolicas non son admitidas nas sincronizacións</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Os nomes de ficheiros que rematan cun punto non son compatíbeis con este sistema de ficheiros.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Os nomes de ficheiros que conteñen o carácter «%1» non son compatíbeis con este sistema de ficheiros.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro contén algún carácter incorrecto</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>O nome do ficheiro é un nome reservado neste sistema de ficheiros.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>O nome do ficheiro contén espazos finais.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>O nome de ficheiro é longo de máis.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>O ficheiro/cartafol ignórase por estar agochado.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Produciuse un fallo na obtención de estatísticas.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflito: Versión do servidor descargada, a copia local cambiou o nome e non se cargou.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>O nome do ficheiro non pode ser codificado no seu sistema de ficheiros.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation>O nome do ficheiro está na lista negra do servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation>O ficheiro ten una extensión reservada para os ficheiros virtuais.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation>tamaño</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation>permisos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation>etag</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation>ID de ficheiro</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation>o servidor non informou de %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation>Movido a un destino incorrecto, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Non está permitido retiralo, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorado por mor da lista negra de «escolla que sincronizar»</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Non se lle permite porque vostede non ten permiso para engadir subcartafoles neste cartafol</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Non se lle permite porque vostede non ten permiso para engadir ficheiros neste cartafol</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Non está permitido o envío xa que o ficheiro é só de lectura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation>Produciuse un erro ao ler a base de datos</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation>O servidor respondeu cun erro ao ler o directorio «%1» : %2 </translation>
</message>
@@ -2775,7 +2770,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<translation>O servidor devolveu código HTTP incorrecto. Agardábase 201, mais recibiuse «%1 %2».</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Produciuse un erro ao escribir os metadatos na base de datos</translation>
</message>
@@ -2947,17 +2942,17 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<translation>Tamaño</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Protocolo de sincronización local</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista da actividade no portapapeis.</translation>
</message>
@@ -3053,51 +3048,22 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<translation>Axustes</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Actividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Xeral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Rede</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Conta</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Actividade</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Xeral</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Rede</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Conta</translation>
</message>
@@ -3441,48 +3407,48 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Compartir con %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation>Compartir o menú contextual</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation>Menú contextual compartir %1 </translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation>Confirmar a eliminación</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation>Confirma que quere eliminar o directorio &lt;i&gt;%1&lt;/i&gt; e todo o seu contido permanentemente? </translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation>Confirma que quere eliminar o ficheiro &lt;i&gt;%1&lt;/i&gt; permanentemente? </translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation>Seleccionar nova localización… </translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
@@ -3491,85 +3457,85 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
%1 </translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>Compartín algo con vostede</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Compartir...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Copiar a ligazón privada no portapapeis</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Enviar a ligazón privada por correo...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>Non está permitido volver compartir este ficheiro</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation>Non está permitido volver compartir este cartafol</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Copiar a ligazón pública no portapapeis</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation>Amosar as versións do ficheiro no navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation>Renomear…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation>Renomear e enviar… </translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation>Mover e renomear… </translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation>Mover, renomear e enviar… </translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation>Eliminar os cambios locais</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation>Mover e enviar… </translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Eliminar</translation>
</message>
@@ -3787,58 +3753,58 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<translation>%1 (omitido por mor do erro anterior, tentándoo de novo en %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Só %1 está dispoñíbel, necesita polo menos %2 para comezar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Non foi posíbel abrir ou crear a base de datos de sincronización local. Asegúrese de ter acceso de escritura no cartafol de sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>Pouco espazo dispoñíbel no disco: As descargas que reduzan o tamaño por baixo de %1 van ser omitidas.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>Non hai espazo libre abondo no servisor para algúns envíos.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Conflito sen resolver.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation>Non foi posíbel actualizar os metadatos do ficheiro virtual: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Empregando ficheiros virtuais con sufixo, mais o sufixo non está estabelecido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Non foi posíbel ler a lista negra da base de datos local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Non foi posíbel ler dende o diario de sincronización.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Non foi posíbel abrir o rexistro de sincronización</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Interrompido</translation>
</message>
@@ -3880,17 +3846,17 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>A cabeceira da suma de comprobación é incorrecta.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>A cabeceira da suma de comprobación contén un tipo de suma de comprobación descoñecido «%1»</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>O ficheiro descargado non coincide coa suma de comprobación. Retomase.</translation>
</message>
@@ -3934,243 +3900,243 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Ten que rexistrarse</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Cartafol %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Non existen cartafoles de sincronización configurados.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Acceder...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Desconectar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Cambios recentes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Cartafoles xestionados:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Abrir o cartafol «%1»</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 nun navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>O servidor na conta %1 executa unha versión %2 que xa non é compatíbel. O uso deste cliente con versións de servidor non admitidas non está probado e é potencialmente perigoso. Proceda baixo a súa propia responsabilidade.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Estado descoñecido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Axustes...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Detalles...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Axuda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Saír de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Versión del servidor non compatíbel</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado dalgunhas contas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado das contas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>A sincronización está desactivada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>A sincronización está en pausa</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>Conflitos sen resolver</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Produciuse un erro durante a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Non hai cartafoles de sincronización configurados</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Continuar todos os cartafoles</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Pausar todos os cartafoles</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Continuar con todas as sincronizacións</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Continuar coa sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Pausar todas as sincronizacións</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Pausar a sincronización</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Saír de todas as contas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Acceder a todas as contas...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nova conta...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>Sobre %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Non hai elementos sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Comprobando os cambios no cartafol remoto «%1»</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Comprobando os cambios no cartafol local «%1»</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizando %1 of %2 (restan %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (restan %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Actualizado</translation>
</message>
@@ -4472,7 +4438,7 @@ Este é un modo novo e experimental. Se decide usalo, informe de calquera proble
<message>
<location filename="../src/gui/main.cpp" line="39"/>
<source>%1 requires on a working system tray. If you are running XFCE, please follow &lt;a href=&quot;http://docs.xfce.org/xfce/xfce4-panel/systray&quot;&gt;these instructions&lt;/a&gt;. Otherwise, please install a system tray application such as &apos;trayer&apos; and try again.</source>
- <translation>%1 require dunha área de notificación. Se está executando XFCE, siga &lt;a href=&quot;http://docs.xfce.org/xfce/xfce4-panel/systray&quot;&gt;estas instrucións&lt;/a&gt;. Senón, instale un aplicativo de área de notificación como «trayer» e ténteo de novo.</translation>
+ <translation>%1 require dunha área de notificación. Se está executando XFCE, siga &lt;a href=&quot;http://docs.xfce.org/xfce/xfce4-panel/systray&quot;&gt;estas instrucións&lt;/a&gt;. Senón, instale unha aplicación de área de notificación como «trayer» e ténteo de novo.</translation>
</message>
</context>
<context>
diff --git a/translations/client_it.ts b/translations/client_it.ts
index 1bcdb40bb..64e4e5641 100644
--- a/translations/client_it.ts
+++ b/translations/client_it.ts
@@ -20,7 +20,7 @@
<message>
<location filename="../src/libsync/filesystem.cpp" line="167"/>
<source>Error removing &apos;%1&apos;: %2</source>
- <translation type="unfinished"/>
+ <translation>Errore durante la rimozione di &apos;%1&apos;: %2</translation>
</message>
<message>
<location filename="../src/libsync/filesystem.cpp" line="183"/>
@@ -94,7 +94,7 @@
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="197"/>
<source>We received an unexpected download Content-Length.</source>
- <translation type="unfinished"/>
+ <translation>Abbiamo ricevuto un inaspettato download Content-Length.</translation>
</message>
<message>
<location filename="../src/libsync/propagatedownload.cpp" line="224"/>
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Annulla</translation>
</message>
@@ -199,257 +199,261 @@
<translation>Connesso a &lt;server&gt; come &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Nessun account configurato.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Aggiungi nuovo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Rimuovi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Scegli cosa sincronizzare</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Forza ora la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Riavvia sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Rimuovi connessione di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
- <translation type="unfinished"/>
+ <translation>Abilita supporto per file virtuali %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
- <translation type="unfinished"/>
+ <translation>(anteprima tech)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(sperimentale)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Creazione della cartella non riuscita</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Impossibile creare la cartella locale &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Conferma rimozione connessione di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Rimuovi connessione di sincronizzazione cartelle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
- <translation type="unfinished"/>
+ <translation>Disabilitare supporto per file virtuali?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
This action will abort any currently running synchronization.</source>
- <translation type="unfinished"/>
+ <translation>Questa azione disabilita il supporto per i file virtuali. Di conseguenza, il contenuto delle cartelle attualmente contrassegnate come &quot;disponibile solo online&quot; verrà scaricato.
+
+L&apos;unico vantaggio di disabilitare il supporto file virtuale è che la funzione di sincronizzazione selettiva sarà nuovamente disponibile.
+
+Questa azione interromperà qualsiasi sincronizzazione in corso.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
- <translation type="unfinished"/>
+ <translation>Disabilita supporto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>La sincronizzazione è in corso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>L&apos;operazione di sincronizzazione è in corso.&lt;br/&gt;Vuoi terminarla?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 in uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 come &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Connesso a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Il server %1 è temporaneamente non disponibile.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Il Server %1 è attualmente in manutenzione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Disconnesso da %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Ottenimento dell&apos;autorizzazione dal browser. &lt;a href=&apos;%1&apos;&gt;Clicca qui&lt;/a&gt; per riaprirle nel browser.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Connessione con %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Nessuna connessione a %1 su %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Accedi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono archiviazioni esterne:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Ci sono nuove cartelle che non sono state sincronizzate poiché sono troppo grandi o archiviazioni esterne:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Conferma rimozione account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vuoi davvero eliminare la connessione all&apos;account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; ciò &lt;b&gt;non&lt;/b&gt; eliminerà alcun file.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Rimuovi connessione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Apri cartella</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
- <translation type="unfinished"/>
+ <translation>Apri cartella locale</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
- <translation type="unfinished"/>
+ <translation>Apri cartella nel browser</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Riprendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Sospendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
- <translation type="unfinished"/>
+ <translation>Disponibilità</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
- <translation type="unfinished"/>
+ <translation>Disabilita supporto per file virtuali...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vuoi davvero fermare la sincronizzazione della cartella &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; ciò &lt;b&gt;non&lt;/b&gt; eliminerà alcun file.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) di %2 in uso. Alcune cartelle, incluse quelle montate in rete o le cartelle condivise, potrebbero avere limiti diversi.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 di %2 in uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Non ci sono informazioni disponibili sull&apos;utilizzo dello spazio di archiviazione.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>La versione %1 del server non è supportata! Procedi a tuo rischio.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Nessuna connessione di %1 configurata.</translation>
</message>
@@ -600,24 +604,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;L&apos;account %1 non ha attività abilitate.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Hai ricevuto %n nuova notifica da %2.</numerusform><numerusform>Hai ricevuto %n nuove notifiche da %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Hai ricevuto %n nuova notifica da %1 e %2.</numerusform><numerusform>Hai ricevuto %n nuove notifiche da %1 e %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Hai ricevuto nuove notifiche da %1, %2 e altri account.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 notifiche - azione richiesta</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -650,7 +654,7 @@ This action will abort any currently running synchronization.</source>
<message>
<location filename="../src/gui/addcertificatedialog.ui" line="71"/>
<source>An encrypted pkcs12 bundle is strongly recommended as a copy will be stored in the configuration file.</source>
- <translation type="unfinished"/>
+ <translation>Si raccomanda vivamente un bundle pkcs12 cifrato, poiché una copia sarà memorizzata nel file di configurazione.</translation>
</message>
<message>
<location filename="../src/gui/addcertificatedialog.cpp" line="38"/>
@@ -773,38 +777,38 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
- <translation type="unfinished"/>
+ <translation>Errore del server: La risposta di PROPFIND non è in formato XML!</translation>
</message>
</context>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
- <translation type="unfinished"/>
+ <translation>Errore durante l&apos;apertura della cartella %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
- <translation type="unfinished"/>
+ <translation>Directory non accessibile sul client, autorizzazione negata</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
- <translation type="unfinished"/>
+ <translation>Cartella non trovata: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>La codifica del nome del file non è valida</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
- <translation type="unfinished"/>
+ <translation>Errore durante la lettura della cartella %1</translation>
</message>
</context>
<context>
@@ -855,13 +859,13 @@ This action will abort any currently running synchronization.</source>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="419"/>
<source>%1 and %n other file(s) have been added.</source>
- <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+ <translation><numerusform>%1 e %n altri file(s) sono stati aggiunti.</numerusform><numerusform>%1 e %n altri file(s) sono stati aggiunti.</numerusform></translation>
</message>
<message>
<location filename="../src/gui/folder.cpp" line="421"/>
<source>%1 has been added.</source>
<comment>%1 names a file.</comment>
- <translation type="unfinished"/>
+ <translation>%1 è stato aggiunto.</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/folder.cpp" line="426"/>
@@ -1067,7 +1071,7 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat
<message>
<location filename="../src/gui/folderman.cpp" line="1372"/>
<source>The selected path does not exist!</source>
- <translation type="unfinished"/>
+ <translation>Il percorso selezionato non esiste!</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1376"/>
@@ -1140,7 +1144,7 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="215"/>
<source>Virtual file support is enabled.</source>
- <translation type="unfinished"/>
+ <translation>Il supporto per file virtuali è abilitato.</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="235"/>
@@ -1205,12 +1209,12 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="979"/>
<source>↓ %1/s</source>
- <translation type="unfinished"/>
+ <translation>↓ %1/s</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="989"/>
<source>↑ %1/s</source>
- <translation type="unfinished"/>
+ <translation>↑ %1/s</translation>
</message>
<message>
<location filename="../src/gui/folderstatusmodel.cpp" line="987"/>
@@ -1368,12 +1372,12 @@ Se è stato un errore e decidi di mantenere i tuoi file, verranno risincronizzat
<message>
<location filename="../src/gui/folderwizard.cpp" line="487"/>
<source>(tech preview)</source>
- <translation type="unfinished"/>
+ <translation>(anteprima tech)</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="487"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(sperimentale)</translation>
</message>
</context>
<context>
@@ -2103,12 +2107,12 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
<source>(tech preview)</source>
- <translation type="unfinished"/>
+ <translation>(anteprima tech)</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(sperimentale)</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
@@ -2236,12 +2240,12 @@ Non è consigliabile utilizzarlo.</translation>
<translation>Ava&amp;nti &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>URL non valido</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Impossibile caricare il certificato. Potrebbe essere la passwor errata ?</translation>
</message>
@@ -2254,144 +2258,139 @@ Non è consigliabile utilizzarlo.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Connesso correttamente a %1: %2 versione %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Connessione a %1 su %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Tempo scaduto durante il tentativo di connessione a %1 su %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentativo di connessione a %1 su %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>La richiesta autenticata al server è stata rediretta a &apos;%1&apos;. L&apos;URL è errato, il server non è configurato correttamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Ricevuta una risposta non valida a una richiesta webdav autenticata.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Accesso negato dal server. Per verificare di avere i permessi appropriati, &lt;a href=&quot;%1&quot;&gt;fai clic qui&lt;/a&gt; per accedere al servizio con il tuo browser.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>URL non valido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>Il server riporta il seguente errore:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>La cartella di sincronizzazione locale %1 esiste già, impostata per la sincronizzazione.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Creazione della cartella locale di sincronizzazione %1... </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>non riuscita.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Impossibile creare la cartella locale %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Nessuna cartella remota specificata!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Errore: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>creazione cartella su ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>La cartella remota %1 è stata creata correttamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>La cartella remota %1 esiste già. Connessione in corso per la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>La creazione della cartella ha restituito un codice di errore HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>La creazione della cartella remota non è riuscita poiché le credenziali fornite sono errate!&lt;br/&gt;Torna indietro e verifica le credenziali.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;La creazione della cartella remota non è riuscita probabilmente perché le credenziali fornite non sono corrette.&lt;/font&gt;&lt;br/&gt;Torna indietro e controlla le credenziali inserite.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Creazione della cartella remota %1 non riuscita con errore &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Una connessione di sincronizzazione da %1 alla cartella remota %2 è stata stabilita.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Connesso con successo a %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>La connessione a %1 non può essere stabilita. Prova ancora.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Rinomina della cartella non riuscita</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Impossibile rimuovere o creare una copia di sicurezza della cartella poiché la cartella o un file in essa contenuto è aperta in un altro programma. Chiudi la cartella o il file e premi Riprova o annulla la configurazione.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Cartella locale %1 creata correttamente!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2481,137 +2480,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>I collegamenti simbolici non sono supportati dalla sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Il file è stato aggiunto alla lista ignorati.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>I nomi del file che terminano con un punto non sono supportati su questo file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>I nomi del file che contengono il carattere &apos;%1&apos; non sono supportati su questo file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Il nome del file contiene almeno un carattere non valido</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Il nome del file è un nome riservato su questo file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Il nome del file contiene spazi alla fine.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Il nome del file è troppo lungo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Il file/cartella è ignorato poiché è nascosto.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Stat non riuscita.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflitto: versione del server scaricata, copia locale rinominata e non caricata</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>Il nome del file non può essere codificato sul tuo file system.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Rimozione non consentita, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorato in base alla lista nera per la scelta di cosa sincronizzare</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere sottocartelle in quella cartella</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Non consentito poiché non disponi dei permessi per aggiungere file in quella cartella</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Il caricamento di questo file non è consentito poiché è in sola lettura sul server, ripristino</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2757,7 +2756,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Codice HTTP errato restituito dal server. Atteso 201, ma ricevuto &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Errore durante la scrittura dei metadati nel database</translation>
</message>
@@ -2929,17 +2928,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Dimensione</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Protocollo di sincronizzazione locale</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Copia</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copia l&apos;elenco delle attività negli appunti.</translation>
</message>
@@ -3035,51 +3034,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Impostazioni</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Attività</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Generale</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Rete</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Account</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Attività</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Generale</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Rete</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Account</translation>
</message>
@@ -3423,133 +3393,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Condividi con %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation>Menu contestuale condivisione</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Errore</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>Ho condiviso qualcosa con te</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Condividi...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Copia link privato negli appunti</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Invia link privato per email</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>Ricondividere questo file non è permesso</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Copia link pubblico negli appunti</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Apri nel browser</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Elimina</translation>
</message>
@@ -3767,58 +3737,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 (saltato per un errore, prova ancora tra %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Sono disponibili solo %1, servono almeno %2 per iniziare</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Non posso aprire o creare il database locale di sincronizzazione. Assicurarsi di avere il i permessi di scrittura nella cartella di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>Lo spazio su disco è scarso: I downloads che ridurranno lo spazio libero al di sotto di %1 verranno saltati.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>Non c&apos;è spazio disponibile sul server per effettuare caricamenti.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Conflitto irrisolto.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Impossibile leggere la lista nera dal database locale</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Impossibile leggere dal registro di sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Impossibile aprire il registro di sincronizzazione</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Interrotto</translation>
</message>
@@ -3860,17 +3830,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>L&apos;intestazione del codice di controllo non è valida.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>L&apos;intestazione di controllo conteneva un tipo di codice di controllo &apos;%1&apos; sconosciuto</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Il file scaricato non verifica il codice di controllo, sarà ripristinato.</translation>
</message>
@@ -3914,243 +3884,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Accedi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Cartella %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Non è stata configurata alcuna cartella per la sincronizzazione.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Apri nel browser</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Accedi...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Esci</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Modifiche recenti</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Cartelle gestite:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Apri la cartella &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Apri %1 nel browser...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Il server sull&apos;account %1 esegue una versione %2 non supportata. L&apos;uso di questo client con versioni di server non supportate non è stato testato ed è potenzialmente pericoloso. Procedi a tuo rischio.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Stato sconosciuto</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Impostazioni...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Dettagli...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Aiuto</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Esci da %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Disconnesso dal %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Versione del server non supportata</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>Disconnesso da un account</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Disconnesso dagli account:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Account %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Disconnesso</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>La sincronizzazione dell&apos;account è disabilitata</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>La sincronizzazione è in pausa</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>Conflitti irrisolti</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Errore durante la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Nessuna cartella configurata per la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Riprendi tutte le cartelle</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Sospendi tutte le cartelle</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Riprendi tutte le sincronizzazioni</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Riprendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Sospendi tutte le sincronizzazioni</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Sospendi la sincronizzazione</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Disconnetti tutti gli account</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Accedi a tutti gli account...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nuovo account...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>Informazioni su %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Nessun elemento sincronizzato di recente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Controllo per cambiamenti in &apos;%1&apos; remoto</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Controllo cambiamenti in &apos;%1 &apos; locale</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizzazione di %1 di %2 (%3 rimanenti)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizzazione di %1 di %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizzazione di %1 (%2 rimanenti)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Sincronizzazione di %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Aggiornato</translation>
</message>
diff --git a/translations/client_ja.ts b/translations/client_ja.ts
index eb6b50434..5702e53fa 100644
--- a/translations/client_ja.ts
+++ b/translations/client_ja.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>キャンセル</translation>
</message>
@@ -199,87 +199,87 @@
<translation>&lt;server&gt; に &lt;user&gt; で接続中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>アカウントが未設定です。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>新規追加</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>アカウント</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>同期フォルダーを選択</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>今すぐ強制的に同期</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>同期を再実行</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>同期フォルダー接続を削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>フォルダーの作成に失敗しました</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;ローカルフォルダー &lt;i&gt;%1&lt;/i&gt; を作成できません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>同期フォルダー接続の削除を確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>同期フォルダー接続を削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -288,168 +288,168 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>同期を実行中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>同期作業を実行中です。&lt;br/&gt;終了しますか?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 を使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>&lt;i&gt;%2&lt;/i&gt; の %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>%1 に接続</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>サーバー %1 は一時的に利用できません</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>サーバー %1 は現在メンテナンスモードです。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>%1 からサインアウトしました。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>ブラウザから権限を取得しています。&lt;a href=&apos;%1&apos;&gt;ここをクリック&lt;/a&gt;してブラウザを再度開いてください。 </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>%1 に接続中...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>%2 の %1 への接続がありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>ログイン</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>大きすぎるため同期されなかったフォルダーがあります:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>外部ストレージにあるため同期されなかったフォルダーがあります:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>大きすぎたか、外部ストレージにあるため同期されなかったフォルダーがあります:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>アカウント削除確認</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt; アカウント &lt;i&gt;%1&lt;/i&gt; を本当に削除しますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注意:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>接続削除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>フォルダーを開く</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>ログアウト</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>再開</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>一時停止</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;フォルダー&lt;i&gt;%1&lt;/i&gt;の同期を本当に止めますか?&lt;/p&gt;&lt;p&gt;&lt;b&gt;注:&lt;/b&gt; これによりファイルが一切削除されることはありません。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%2 の %1(%3%) 利用中。外部ネットワークストレージや共有フォルダーを含むフォルダーがある場合は、容量の上限値が異なる可能性があります。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%2 のうち %1 を使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>現在、利用できるストレージ利用状況はありません。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>%1 の接続は設定されていません。</translation>
</message>
@@ -600,24 +600,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;%1 アカウントは、 アクティビティを有効にしていません。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>%2 から %n の新しい通知がありました。</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>%1 と %2 から %n の新しい通知がありました。</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>%1 と %2 、その他アカウントから新しい通知がありました。</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>通知 %1 - 操作が必要です。</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,8 +773,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -782,27 +782,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>ファイル名のエンコーディングが無効です。</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -2228,12 +2228,12 @@ It is not advisable to use it.</source>
<translation>次(&amp;N) &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>無効なURL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"/>
</message>
@@ -2246,144 +2246,139 @@ It is not advisable to use it.</source>
<translation>&lt;font color=&quot;green&quot;&gt;正常に %1 へ接続されました:%2 バージョン %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>%2 の %1 に接続に失敗:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>%2 の %1 へ接続を試みた際にタイムアウトしました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>%2 の %1 へ接続を試みています...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>サーバーへの認証リクエストは &apos;%1&apos; へリダイレクトされました。URLは不正です、サーバーの設定に誤りがあります。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>認証された WebDav リクエストに不正な応答がありました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>サーバーによってアクセスが拒否されています。適切なアクセス権があるか検証するには、&lt;a href=&quot;%1&quot;&gt;ここをクリック&lt;/a&gt;してブラウザーでサービスにアクセスしてください。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>無効なURL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>サーバが以下のエラーを報告しています:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>ローカルの同期フォルダー %1 はすでに存在するため、同期の設定をしてください。&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>ローカル同期フォルダー %1 を作成中...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>失敗。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>ローカルフォルダー %1 を作成できませんでした</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>リモートフォルダーが指定されていません!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>エラー: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>ownCloud上にフォルダーを作成中: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>リモートフォルダー %1 は正常に生成されました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>リモートフォルダー %1 はすでに存在します。同期のために接続しています。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>フォルダーの作成はHTTPのエラーコード %1 で終了しました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>指定された資格情報が間違っているため、リモートフォルダーの作成に失敗しました!&lt;br/&gt;前に戻って資格情報を確認してください。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;おそらく資格情報が間違っているため、リモートフォルダーの作成に失敗しました。&lt;/font&gt;&lt;br/&gt;前に戻り、資格情報をチェックしてください。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>リモートフォルダー %1 の作成がエラーで失敗しました。&lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>%1 からリモートディレクトリ %2 への同期接続を設定しました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>%1への接続に成功しました!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>%1 への接続を確立できませんでした。もう一度確認してください。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>フォルダー名の変更に失敗しました。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>フォルダーまたはその中にあるファイルが他のプログラムで開かれているため、フォルダーの削除やバックアップができません。フォルダーまたはファイルを閉じてから再試行するか、セットアップをキャンセルしてください。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;ローカルの同期フォルダー %1 は正常に作成されました!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2473,137 +2468,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>同期機能はシンボリックリンクをサポートしていません。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>ファイルは除外リストに登録されています。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>末尾にピリオドを使うファイル名はサポートされていません</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>ファイル名に使用できない文字列が含まれています: &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>ファイル名に1文字以上の無効な文字が含まれています</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>ファイル名はこのファイルシステムで予約されている名前です。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>ファイル名末尾にスペースが含まれます。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>ファイル名が長すぎます</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>隠しファイル/フォルダーのため無視されました</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>情報取得エラー</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>削除できないので復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>&quot;同期対象先&quot; ブラックリストにより無視されました。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>そのフォルダーにサブフォルダーを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>そのフォルダーにファイルを追加する権限がありません</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>サーバーでは読み取り専用となっているため、このファイルをアップロードすることはできません、復元しています</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2749,7 +2744,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>誤ったHTTPコードがサーバーから返されました。201のはずが、&quot;%1 %2&quot;が返りました。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>メタデータのデータベースへの書き込みに失敗</translation>
</message>
@@ -2921,17 +2916,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>サイズ</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>ローカルファイル同期状況</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>コピー</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>アクティビティ一覧をコピーする</translation>
</message>
@@ -3027,51 +3022,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>設定</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>アクティビティ</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>一般</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>ネットワーク</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>アカウント</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>アクティビティ</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>一般</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>ネットワーク</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>アカウント</translation>
</message>
@@ -3415,133 +3381,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>%1 と共有</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>エラー</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>ブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>削除</translation>
</message>
@@ -3759,58 +3725,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>%1 しか空き容量がありません、開始するためには少なくとも %2 は必要です。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>ローカルデータベースからブラックリストを読み込みできません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>同期ジャーナルから読み込みできません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>同期ジャーナルを開くことができません</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>中止しました</translation>
</message>
@@ -3852,17 +3818,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>ヘッダーのチェックサムが異常です。</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>チェックサムヘッダーに &apos;%1&apos; という未知のチェックサムが含まれていました</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>ダウンロードしたファイルがチェックサムエラーです。再ダウンロードします。</translation>
</message>
@@ -3906,243 +3872,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>サインインしてください</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>フォルダー %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>同期するフォルダーがありません。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>ブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>ログイン...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>ログアウト</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>最近変更されたファイル</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>管理フォルダー:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>フォルダー ’%1’ を開く</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>%1をブラウザーで開く</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>不明な状態</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>設定...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>詳細...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>ヘルプ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>%1 を終了</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>%1 から切断されました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>サポートされていないサーバーバージョン</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>切断しました</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>アカウントから切断:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>アカウント %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>サインアウト</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>アカウントの同期は無効になっています</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>すべてのフォルダーの同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>すべてのフォルダーの同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>すべての同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>同期を再開</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>すべての同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>同期を一時停止</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>全てのアカウントからログアウト</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>全てのアカウントにログイン</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>新規アカウント...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>%1 について</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>最近同期されたアイテムはありません。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>同期中 %2 中 %1 (残り %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>%2 の %1 を同期しています</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>同期中 %1 (残り %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>同期中 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>最新です</translation>
</message>
diff --git a/translations/client_nb_NO.ts b/translations/client_nb_NO.ts
index 9c8ef99b5..b74877ab4 100644
--- a/translations/client_nb_NO.ts
+++ b/translations/client_nb_NO.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Tilkoblet &lt;server&gt; som &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Ingen konto konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Legg til ny</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Fjern</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Velg hva som synkroniseres</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Tving synkronisering nå</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Prøv synkronisering igjen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Fjern tilkobling for mappe-synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Oppretting av mappe feilet</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Klarte ikke å opprette lokal mappe &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bekreft fjerning av tilkobling for mappe-synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Fjern tilkobling for mappe-synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -288,168 +288,168 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Synkroniserer...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Synkronisering kjører.&lt;br/&gt;Vil du avbryte den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 i bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 som &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Tilkoblet %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 er midlertidig utilgjengelig.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Server %1 er for øyeblikket i vedlikeholdsmodus.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Logget ut fra %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Hente autorisasjon fra nettleseren. &lt;a href=&apos;%1&apos;&gt;Klikk her &lt;/a&gt; for å åpne nettleseren på nytt.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Kobler til %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Ingen tilkobling til %1 på %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Logg inn</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Noen mapper ble ikke synkronisert fordi de er for store</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Noen mapper ble ikke synkronisert fordi de er eksterne lagringsplasser:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Noen mapper ble ikke synkronisert fordi de er for store eller de er eksterne lagringsplasser:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Bekreft fjerning av konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vil du virkelig fjerne tilkoblingen til kontoen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Merk:&lt;/b&gt; Dette vil &lt;b&gt;ikke&lt;/b&gt; slette noen filer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Fjern tilkobling</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Åpne mappe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Logg ut</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Fortsett synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Sett synkronisering på pause</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vil du virkelig stoppe synkronisering av mappen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Merk:&lt;/b&gt; Dette vil &lt;b&gt;ikke&lt;/b&gt; slette noen filer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) av %2 i bruk. Noen mapper, inkludert nettverkstilkoblede eller delte mapper, kan ha andre begrensninger.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 av %2 i bruk</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Ingen informasjon om bruk av lagringsplass tilgjengelig for øyeblikket.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1-forbindelse konfigurert.</translation>
</message>
@@ -600,24 +600,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;Konto %1 har ikke aktiviteter aktivert.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Du mottok %n nytt varsel fra %2.</numerusform><numerusform>Du mottok %n nye varsler fra %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Du mottok %n nytt varsel fra %1 og %2.</numerusform><numerusform>Du mottok %n nye varsler fra %1 og %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Du mottok nye varsler fra %1, %2 og andre kontoer.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 varsler - Handling kreves</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,8 +773,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -782,27 +782,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Filnavn-koding er ikke gyldig</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -2232,12 +2232,12 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>&amp;Neste &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>Ugyldig URL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Kunne ikke laste inn sertifikat. Kanskje feil passord?</translation>
</message>
@@ -2250,144 +2250,139 @@ Det er ikke tilrådelig å bruke den.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Vellykket oppkobling mot %1: %2 versjon %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Klarte ikke å koble til %1 på %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Tidsavbrudd ved oppkobling mot %1 på %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Prøver å koble til %1 på %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>Autentisert forespørsel til serveren ble omdirigert til &apos;%1&apos;. URL-en er ugyldig, serveren er feilkonfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Det kom et uventet svar fra en autentisert webdav-forespørsel.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Tilgang forbudt av serveren. For å sjekke om du har gyldig tilgang, &lt;a href=&quot;%1&quot;&gt;klikk her&lt;/a&gt; for å aksessere tjenesten med nettleseren din.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>Ugyldig URL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>Serveren rapporterte følgende feil:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Lokal synkroniseringsmappe %1 finnes allerede. Setter den opp for synkronisering.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Oppretter lokal synkroniseringsmappe %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>feilet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Klarte ikke å opprette lokal mappe %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Ingen ekstern mappe spesifisert!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Feil: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>oppretter mappe på ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Ekstern mappe %1 ble opprettet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Ekstern mappe %1 finnes allerede. Kobler den til for synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Oppretting av mappe resulterte i HTTP-feilkode %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>Oppretting av ekstern mappe feilet fordi påloggingsinformasjonen er feil!&lt;br/&gt;Gå tilbake og sjekk brukernavnet og passordet ditt.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Oppretting av ekstern mappe feilet, sannsynligvis fordi oppgitt påloggingsinformasjon er feil.&lt;/font&gt;&lt;br/&gt;Vennligst gå tilbake og sjekk ditt brukernavn og passord.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Oppretting av ekstern mappe %1 feilet med feil &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>En synkroniseringsforbindelse fra %1 til ekstern mappe %2 ble satt opp.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Forbindelse til %1 opprettet!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Klarte ikke å etablere forbindelse til %1. Sjekk igjen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Omdøping av mappe feilet</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Kan ikke fjerne og sikkerhetskopiere mappen fordi mappen eller en fil i mappen er åpen i et annet program. Lukk mappen eller filen og prøv igjen, eller avbryt oppsettet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Oppretting av lokal synkroniseringsmappe %1 vellykket!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2477,137 +2472,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolske lenker støttes ikke i synkronisering.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Filen ligger på ignoreringslisten.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Filnavn som slutter med punktum er ikke tillatt på dette filsystemet</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Filnavn som inneholder &apos;%1&apos; er ikke tillatt på dette filsystemet</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Filnavnet inneholder minst ett ulovlig tegn</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Filnavnet er et reservert navn på dette filsystemet.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Filnavn inneholder blanke på slutten.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Filnavn er for langt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Filen/mappen ignoreres fordi den er skjult.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Stat feilet.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Konflikt: Serverversjon lastet ned, lokal kopi har byttet navn og er ikke lastet opp.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>Filnavnet kan ikke kodes på filsystemet ditt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Ikke tillatt å fjerne, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorert på grunn av svartelisten &quot;velg hva som skal synkroniseres&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å lage undermapper i den mappen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Ikke tillatt fordi du ikke har lov til å opprette filer i den mappen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ikke tillatt å laste opp denne filenfordi den er skrivebeskyttet på serveren, gjenoppretter</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2753,7 +2748,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Feil HTTP-kode returnert fra server. Ventet 201, men mottok &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Feil ved skriving av metadata til databasen</translation>
</message>
@@ -2925,17 +2920,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Størrelse</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Lokal synkroniseringsprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Kopier</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopier aktivitetslisten til utklippstavlen.</translation>
</message>
@@ -3031,51 +3026,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Innstillinger</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Generelt</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Nettverk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Aktivitet</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Generelt</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Nettverk</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -3419,133 +3385,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Del med %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Feil</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>Jeg delte noe med deg</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Del...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Kopier privat URL til utklippstavlen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Send privat link i e-post</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>Videre deling av denne filen er ikke tillatt</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Kopier offentlig link til utklippstavlen</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Åpne i nettleser</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Slett</translation>
</message>
@@ -3763,58 +3729,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 (hoppet over på grunn av tidligere feil, prøver igjen om %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Bare %1 er tilgjengelig, trenger minst %2 for å begynne</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Kan ikke åpne eller opprette den lokale synkroniseringsdatabasen. Kontroller at du har skrivetilgang i synkroniseringsmappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>Diskplass er lav: Nedlastinger som ville redusere ledig plass under% 1 ble hoppet over.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>Det er ikke nok ledig plass på serveren for noen av opplastingene.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Uløst konflikt</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kan ikke lese svartelisten fra den lokale databasen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Kan ikke lese fra synkroniseringsjournalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Kan ikke åpne synkroniseringsjournalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation type="unfinished"/>
</message>
@@ -3856,17 +3822,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>Sjekksum-headeren har feil format.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Sjekksum-header inneholdt ukjent sjekksum-type &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Den nedlastede filen passer ikke med sjekksummen, den vil bli gjenopptatt.</translation>
</message>
@@ -3910,243 +3876,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Vennligst logg inn</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Mappe %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Ingen synkroniseringsmapper er konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Åpne i nettleser</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Logg inn..</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Logg ut</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Siste endringer</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Administrerte mapper:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Åpne mappe &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Åpne %1 i nettleser</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Ukjent status</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Innstillinger...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Detaljer...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Hjelp</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Avslutt %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Koble fra %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Server-versjonen støttes ikke</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Frakoblet</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>Frakoblet noen kontoer</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Koblet fra kontoer:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Logget ut</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>Kontosynkronisering er deaktivert</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>Synkronisering er satt på pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>Uløste konflikter</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Feil under synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Ingen synkronisering-mapper konfigurert.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Fortsett alle mapper</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Sett alle mapper på pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Fortsett all synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Fortsett synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Sett all synkronisering på pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Sett synkronisering på pause</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Logg ut av alle kontoer</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Logg inn på alle kontoer...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Ny konto...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>Om %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Ingenting synkronisert nylig</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Sjekker for endringer i ekstern &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Sjekker for endringer i lokal &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synkroniserer %1 av %2 (%3 gjenstår)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Synkroniserer %1 av %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synkroniserer %1 (%2 gjenstår)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Synkroniserer %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Oppdatert</translation>
</message>
diff --git a/translations/client_nl.ts b/translations/client_nl.ts
index bffbd1f4f..47d949620 100644
--- a/translations/client_nl.ts
+++ b/translations/client_nl.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Annuleren</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Verbonden met &lt;server&gt; als &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Geen account ingesteld.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Toevoegen nieuw</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Verwijder</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Selectieve synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Forceer sync nu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Herstarten sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Verwijder map-synchronisatie verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Maken map mislukt</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Kon lokale map &lt;i&gt;%1&lt;/i&gt; niet maken.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bevestig verwijderen map-synchronisatie verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Verwijder map-synchronisatie verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation>Ondersteuning voor virtuele bestanden uitschakelen?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -292,168 +292,168 @@ Het enige voordeel van het uitschakelen van virtuele bestanden ondersteuning is
Deze actie annuleert alle huidig lopende synchronisatie.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation>Ondersteuning uitschakelen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Bezig met synchroniseren</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Bezig met synchroniseren.&lt;br/&gt;Wilt u stoppen met synchroniseren?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 in gebruik</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 als &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Verbonden met %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Server %1 is tijdelijk niet beschikbaar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Server %1 is momenteel in onderhoudsmodus.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Uitgelogd van %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Probeert autorisatie te krijgen van de browser. &lt;a href=&apos;%1&apos;&gt; Klik hier&lt;/a&gt; om de browser opnieuw te openen.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Verbinden met %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Geen verbinding met %1 op %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Meld u aan</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze op externe opslag staan:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Er zijn mappen die niet gesynchroniseerd werden, omdat ze te groot zijn of op externe opslag staan:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Bevestig verwijderen account</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Wilt u echt de verbinding met het account &lt;i&gt;%1&lt;/i&gt; verbreken?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Let op:&lt;/b&gt; Hierdoor verwijdert u &lt;b&gt;geen&lt;/b&gt; bestanden.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Verwijderen verbinding</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Openen map</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Afmelden</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation>Open lokale map</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation>Open map in browser</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Hervatten sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Pauzeren sync</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation>Beschikbaarheid</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation>Schakel virtuele bestanden ondersteuning uit...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Weet u zeker dat u de synchronisatie van map &lt;i&gt;%1&lt;/i&gt; wilt stoppen?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opmerking:&lt;/b&gt; Dit zal &lt;b&gt;geen&lt;/b&gt; bestanden verwijderen.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) van %2 in gebruik. Sommige mappen, inclusief netwerkmappen en gedeelde mappen, kunnen andere limieten hebben.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 van %2 in gebruik</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Er is nu geen informatie over het gebruik van de opslagruimte beschikbaar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>De server versie %1 is niet ondersteund! Ga door op eigen risico.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Geen %1 connectie geconfigureerd.</translation>
</message>
@@ -604,24 +604,24 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation>
<translation>&lt;br/&gt;Account %1 heeft geen activiteiten ingeschakeld.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>U ontving %n nieuw bericht van %2.</numerusform><numerusform>U ontving %n nieuwe berichten van %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>U ontving %n nieuwe melding(en) van %1 en %2.</numerusform><numerusform>U ontving %n nieuwe melding(en) van %1 en %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Je hebt nieuwe berichten ontvangen van %1, %2 en andere acounts</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Berichten - Actie verwacht</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -777,8 +777,8 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -786,27 +786,27 @@ Deze actie annuleert alle huidig lopende synchronisatie.</translation>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Bestandsnaamcodering is niet geldig</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -2238,12 +2238,12 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>&amp;Volgende &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>Ongeldige URL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"/>
</message>
@@ -2256,144 +2256,139 @@ We adviseren deze site niet te gebruiken.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Succesvol verbonden met %1: %2 versie %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Kon geen verbinding maken met %1 op %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Time-out bij verbinden met %1 om %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Probeer te verbinden met %1 om %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>De geauthentiseerde aanvraag voor de server werd omgeleid naar &apos;%1&apos;. De URL is onjuist, de server is verkeerd geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Er was een ongeldig antwoord op een geauthenticeerde webdav opvraging</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Toegang door server verboden. Om te verifiëren dat u toegang mag hebben, &lt;a href=&quot;%1&quot;&gt;klik hier&lt;/a&gt; om met uw browser toegang tot de service te krijgen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>Ongeldige URL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>De server rapporteerde de volgende fout:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Lokale synch map %1 bestaat al, deze wordt ingesteld voor synchronisatie.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Creëren lokale sync map %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>mislukt.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Kon lokale map %1 niet aanmaken</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Geen externe map opgegeven!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Fout: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>aanmaken map op ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Externe map %1 succesvol gecreërd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>De remote map %1 bestaat al. Verbinden voor synchroniseren.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Het aanmaken van de map resulteerde in HTTP foutcode %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.&lt;br/&gt;Ga terug en controleer uw inloggegevens.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Het aanmaken van de remote map is mislukt, waarschijnlijk omdat uw inloggegevens fout waren.&lt;/font&gt;&lt;br/&gt;ga terug en controleer uw inloggevens.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Aanmaken van remote map %1 mislukt met fout &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Er is een sync verbinding van %1 naar remote directory %2 opgezet.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Succesvol verbonden met %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Verbinding met %1 niet geslaagd. Probeer het nog eens.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Hernoemen map mislukt</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Kan de map niet verwijderen en backuppen, omdat de map of een bestand daarin, geopend is in een ander programma. Sluit de map of het bestand en drup op Opnieuw of annuleer de installatie.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Lokale synch map %1 is succesvol aangemaakt!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2483,137 +2478,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symbolische links worden niet ondersteund bij het synchroniseren.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Het bestand is opgenomen op de negeerlijst.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Bestandsnamen die eindigen met een punt worden niet ondersteund door het bestandssysteem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Bestandsnamen met een &apos;%1&apos; symbool worden niet ondersteund door het bestandssysteem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>De bestandsnaam bevat ten minste één ongeldig teken</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>De bestandsnaam is een gereserveerde naam op dit bestandssysteem.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>De bestandsnaam bevat spaties achteraan.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>De bestandsnaam is te lang.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Bestand/Map is genegeerd omdat het verborgen is. </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Stat mislukt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Niet toegestaan om te verwijderen, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Genegeerd vanwege de &quot;wat synchroniseren&quot; zwarte lijst</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Niet toegestaan, omdat je geen permissies hebt om submappen aan die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Niet toegestaan omdat u geen rechten hebt om bestanden in die map toe te voegen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Niet toegestaan om dit bestand te uploaden, omdat het alleen-lezen is op de server, herstellen</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2759,7 +2754,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Foutieve HTTP code ontvangen van de server. Verwacht was 201, maar ontvangen &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Fout bij schrijven van Metadata naar de database</translation>
</message>
@@ -2931,17 +2926,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Grootte</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Lokaal sync protocol</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Kopiëren</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopieer de activiteitenlijst naar het klembord.</translation>
</message>
@@ -3037,51 +3032,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Instellingen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Activiteit</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Algemeen</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Netwerk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Account</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Activiteit</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Algemeen</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Netwerk</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Account</translation>
</message>
@@ -3426,133 +3392,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Delen met %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Fout</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>Ik deelde iets met u</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Delen...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Kopiëren privé-link naar klembord</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Open in browser</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Verwijderen</translation>
</message>
@@ -3770,58 +3736,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Slechts %1 beschikbaar, maar heeft minimaal %2 nodig om te starten</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kan de blacklist niet lezen uit de lokale database</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Niet mogelijk om te lezen uit het synchronisatie verslag.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Kan het sync transactielog niet openen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Afgebroken</translation>
</message>
@@ -3863,17 +3829,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>De header van het controlegetal is misvormd.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Het header controlegetal bevat een onbekend controlegetal type &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Het gedownloade bestand komt niet overeen met het controlegetal. Het wordt opnieuw verwerkt.</translation>
</message>
@@ -3917,243 +3883,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Log alstublieft in</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Map %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Er zijn geen synchronisatie-mappen geconfigureerd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Open in browser</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Inloggen...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Afmelden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Recente wijzigingen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Beheerde mappen:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Open map &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Open %1 in browser</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Onbekende status</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Instellingen...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Details ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Help</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>%1 afsluiten</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Losgekoppeld van %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Niet-ondersteunde server versie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Niet verbonden</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Losgekoppeld van account:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Account %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Afgemeld</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>Account synchronisatie is uitgeschakeld</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Hervat alle mappen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Pauzeer alle mappen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Hervat alle synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Hervat synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Pauzeer alle synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Pauzeer synchronisatie</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Uitloggen van alle accounts...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Inloggen op alle accounts...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nieuw account...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>About %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Recent niets gesynchroniseerd</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sync %1 van %2 (%3 over)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Synchroniseren %1 van %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sync %1 (%2 over)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Synchroniseren %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Bijgewerkt</translation>
</message>
diff --git a/translations/client_pl.ts b/translations/client_pl.ts
index 9f40a4975..1efd51e96 100644
--- a/translations/client_pl.ts
+++ b/translations/client_pl.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Anuluj</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Połączony z &lt;server&gt; jako &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Brak skonfigurowanych kont.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Dodaj nowe</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Usuń</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Wybierz co synchronizować</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Zsynchronizuj teraz</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Uruchom ponownie synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Usuń folder połączenia synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Nie udało się stworzyć katalogu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Nie można stworzyć lokalnego katalogu &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potwierdź usunięcie połączenia folderów synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Usuń folder połączenia synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -288,168 +288,168 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Synchronizacja uruchomiona</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Operacja synchronizacji jest uruchomiona.&lt;br&gt;Czy chcesz ją zakończyć?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 w użyciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 jako &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Podłączony do %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Serwer %1 jest tymczasowo niedostępny.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Serwer %1 jest obecnie w trybie konserwacji.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Wylogowano z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Łączenie do %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Brak połączenia do %1 z %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Zaloguj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Te foldery nie zostały zsynchronizowane ponieważ są zbyt duze:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Te foldery nie zostały zsynchronizowane ponieważ znajdują się w pamięci zewnętrznej:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Te foldery nie zostały zsynchronizowane ponieważ są zbyt duże lub znajdują się w pamięci zewnętrznej:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Potwierdź usunięcie konta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Czy na pewno chcesz usunąć połączenie z kontem &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; ta operacja &lt;b&gt;nie&lt;/b&gt; usunie plików klienta.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Usuwanie połączenia</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Otwórz katalog</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Wyloguj</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Przywróć synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Zatrzymaj synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Czy na pewno chcesz zatrzymać synchronizację folderu &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Uwaga:&lt;/b&gt; ta operacja &lt;b&gt;nie&lt;/b&gt; usunie plików z klienta.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) z %2 w użyciu. Niektóre foldery, w tym zamontowane lub udostępnione foldery w sieci, mogą mieć różne limity.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 z %2 w użyciu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Obecnie nie ma dostępnych informacji o wykorzystaniu pamięci masowej.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>Wersja %1 serwera nie jest obsługiwana! Wchodzisz na własne ryzyko.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Połączenie %1 nie skonfigurowane.</translation>
</message>
@@ -600,24 +600,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;Użytkownik %1 nie ma włączonej historii aktywności.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Otrzymano %n nowe powiadomienie od %2.</numerusform><numerusform>Otrzymano %n nowe powiadomienia od %2.</numerusform><numerusform>Otrzymano %n nowych powiadomień od %2.</numerusform><numerusform>Otrzymano %n nowych powiadomień od %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Otrzymano %n nowe powiadomienie od %1 i %2.</numerusform><numerusform>Otrzymano %n nowe powiadomienia od %1 i %2.</numerusform><numerusform>Otrzymano %n nowych powiadomień %1 i %2.</numerusform><numerusform>Otrzymano %n nowych powiadomień %1 i %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Otrzymałeś nowe powiadomienia z %1, %2 i innych kont.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Powiadomień - Wymagana akcja</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,8 +773,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -782,27 +782,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -2228,12 +2228,12 @@ Niezalecane jest jego użycie.</translation>
<translation>Następny</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>Błędny adres url.</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Nie mogę załadować certyfikatu. Może hasło jest nieprawidłowe?</translation>
</message>
@@ -2246,144 +2246,139 @@ Niezalecane jest jego użycie.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Udane połączenie z %1: %2 wersja %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Nie udało się połączyć do %1 w %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Upłynął czas podczas próby połączenia do %1 na %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Próba połączenia z %1 w %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Dostęp zabroniony przez serwer. Aby sprawdzić, czy masz odpowiednie uprawnienia, kliknij &lt;a href=&quot;%1&quot;&gt;tutaj&lt;/a&gt;, aby połączyć się z usługą poprzez przeglądarkę.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>Błędny adres url.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>Serwer zgłosił następujący błąd:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Lokalny folder synchronizacji %1 już istnieje. Ustawiam go do synchronizacji.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Tworzenie lokalnego folderu synchronizacji %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>OK</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>Błąd.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Nie udało się utworzyć lokalnego folderu %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Nie określono folderu zdalnego!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Błąd: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>tworzę folder na ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Zdalny folder %1 został utworzony pomyślnie.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Zdalny folder %1 już istnieje. Podłączam go do synchronizowania.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Tworzenie folderu spowodowało kod błędu HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>Nie udało się utworzyć zdalnego folderu ponieważ podane dane dostępowe są nieprawidłowe!&lt;br/&gt;Wróć i sprawdź podane dane dostępowe.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Tworzenie folderu zdalnego nie powiodło się. Prawdopodobnie dostarczone poświadczenia są błędne.&lt;/font&gt;&lt;br/&gt;Wróć i sprawdź poświadczenia.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Tworzenie folderu zdalnego %1 nie powiodło się z powodu błędu &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Połączenie synchronizacji z %1 do katalogu zdalnego %2 zostało utworzone.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Udane połączenie z %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Połączenie z %1 nie może być nawiązane. Sprawdź ponownie.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Zmiana nazwy folderu nie powiodła się</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Nie można usunąć i zarchiwizować folderu ponieważ znajdujący się w nim plik lub folder jest otwarty przez inny program. Proszę zamknąć folder lub plik albo kliknąć ponów lub anuluj setup.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Utworzenie lokalnego folderu synchronizowanego %1 zakończone pomyślnie!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2473,137 +2468,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linki symboliczne nie są wspierane przy synchronizacji. </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Plik jest na liście plików ignorowanych.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Nazwy plików zawierające znaki &apos;%1&apos; nie są wspierane </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Nazwa pliku zawiera co najmniej jeden nieprawidłowy znak</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Nazwa pliku jest zarezerwowana dla plików systemowych</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Nazwa pliku zawiera spacje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Nazwa pliku zbyt długa</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Plik / katalog zostanie zignorowany, ponieważ jest ukryty.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Błąd statystyk.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Konflikt: Pobrano wersję z serwera, lokalna kopia została zapisana z nową nazwą pliku i nie została wysłana na serwer.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Brak uprawnień by usunąć, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania podkatalogów w tym katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Niedozwolone, ponieważ nie masz uprawnień do dodawania plików w tym katalogu</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Wgrywanie niedozwolone, ponieważ plik jest tylko do odczytu na serwerze, przywracanie</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2749,7 +2744,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Błąd podczas zapisu metadanych do bazy</translation>
</message>
@@ -2921,17 +2916,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Rozmiar</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Lokalny protokół synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Kopiuj</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiuj listę aktywności do schowka.</translation>
</message>
@@ -3027,51 +3022,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ustawienia</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Aktywność</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Ogólne</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Sieć</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Aktywność</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Ogólne</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Sieć</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -3415,133 +3381,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Współdzielone z %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Błąd</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>Udostępniam Tobie</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Udostępnij...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Kopiuj link prywatny do schowka</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Wyślij link prywatny przez e-mail</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Kopiuj link publiczny do schowka</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Otwórz w przeglądarce</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Usuń</translation>
</message>
@@ -3759,58 +3725,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Tylko %1 są dostępne, potrzebujesz przynajmniej %2 aby rozpocząć</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Nierozwiązany konfilkt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Nie można odczytać czarnej listy z lokalnej bazy danych</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Nie można czytać z dziennika synchronizacji.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Nie można otworzyć dziennika synchronizacji</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Anulowane</translation>
</message>
@@ -3852,17 +3818,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation type="unfinished"/>
</message>
@@ -3906,243 +3872,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Proszę się zalogować</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Folder %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Nie skonfigurowano żadnych folderów synchronizacji.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Otwórz w przeglądarce</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Zaloguj...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Wyloguj</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Ostatnie zmiany</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Zarządzane foldery:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Otwórz katalog &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Otwórz %1 w przeglądarce</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Nieznany status</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Ustawienia...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Szczegóły...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Pomoc</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Wyjdź %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Rozłączony z %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Nie wspierana wersja serwera</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Rozłączony</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>Rozłącz od wybranych kont</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Rozłączony z kontami:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Dostęp %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Odłączony</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>Konto synchronizacji jest wyłączone</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>Synchronizacja wstrzymana</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>Nierozwiązane konfilkty</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Błąd podczas synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Nie ustawiono katalogów do synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Wznów wszystkie katalogi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Wstrzymaj wszystkie katalogi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Wznów wszystkie synchronizacje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Wznów synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Wstrzymaj wszystkie synchronizacje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Wstrzymaj synchronizację</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Wyloguj się się ze wszystkich kont</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Zaloguj się do wszystkich kont</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nowe konto...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>O %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Brak ostatnich synchronizacji</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Sprawdzanie zmian w lokalizacji zdalnej &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Sprawdzanie zmian w lokalizacji lokalnej &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synchronizacja %1 z %2 (%3 pozostało)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Synchronizowanie %1 of %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synchronizuję %1 (%2 pozostało)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Synchronizowanie %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Aktualne</translation>
</message>
diff --git a/translations/client_pt.ts b/translations/client_pt.ts
index 57fc2a97d..883ea9111 100644
--- a/translations/client_pt.ts
+++ b/translations/client_pt.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Ligado ao &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Adicionar nova</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Remover</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Escolher o que sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Forçar a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Retomar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Remover ligação de sincronização de pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Não foi possível criar a pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Não foi possível criar a pasta local&lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirmar Remoção da Ligação de Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Remover Ligação da Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -288,168 +288,168 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Sincronização em Execução</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>A operação de sincronização está em execução.&lt;br/&gt;Deseja terminá-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 em utilização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Ligado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>O servidor %1 está temporariamente indisponível.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>O Servidor %1 encontra-se em manutenção</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Terminou a sessão de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>A Conectar a %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Sem ligação para %1 em %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Iniciar Sessão</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Existem pastas que não foram sincronizadas por serem demasiado grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Existem pastas que não foram sincronizadas por serem armazenamento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Existem pastas que não foram sincronizadas por serem demasiado grandes ou armazenamento externo:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Confirmar Remoção da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Deseja mesmo remover a ligação da conta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; isto &lt;b&gt;não&lt;/b&gt; irá eliminar quaisquer ficheiros.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Remover ligação</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Abrir pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Terminar sessão</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Retomar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Deseja mesmo parar a sincronização da pasta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; isto &lt;b&gt;não&lt;/b&gt; irá eliminar qualquer ficheiro.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de %2 em utilização. Algumas pastas, incluindo a rede montada ou as pastas partilhadas, podem ter limites diferentes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 em utilização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente não está disponível nenhuma informação da utilização do armazenamento.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>%1 sem ligação configurada.</translation>
</message>
@@ -600,24 +600,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;A conta %1 não tem atividades ativadas.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Recebeu %n nova notificação de %2.</numerusform><numerusform>Recebeu %n novas notificações de %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Recebeu %n nova notificação de %1 e %2.</numerusform><numerusform>Recebeu %n novas notificações de %1 e %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Recebeu novas notificações de %1, %2 e outras contas.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Notificações - Ação Necessária</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,8 +773,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -782,27 +782,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Codificação de nome de ficheiro não é válida</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -2230,12 +2230,12 @@ Não é aconselhada a sua utilização.</translation>
<translation>&amp;Seguinte &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>URL inválido</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"/>
</message>
@@ -2248,144 +2248,139 @@ Não é aconselhada a sua utilização.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Ligado com sucesso a %1: %2 - versão: %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Não foi possível ligar a %1 em %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Tempo expirou enquanto tentava ligar a %1 em %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>A tentar ligar a %1 em %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>O pedido de autenticação para o servidor foi redirecionado para &apos;%1&apos;. O URL é mau, o servidor está mal configurado. </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Houve uma resposta inválida para o pedido de autenticação webdav</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Acesso proibido pelo servidor. Para verificar que tem o acesso adequado, &lt;a href=&quot;%1&quot;&gt;clique aqui&lt;/a&gt; para aceder ao serviço com o seu navegador.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>URL inválido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>O servidor retornou o seguinte erro:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>A pasta de sincronização local %1 já existe, a configurar para sincronizar.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>A criar a pasta de sincronização local %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>Falhou.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Não foi possível criar a pasta local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Não foi indicada a pasta remota!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>a criar a pasta na ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Criação da pasta remota %1 com sucesso!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>A pasta remota %1 já existe. Ligue-a para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A criação da pasta resultou num erro HTTP com o código %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.&lt;br/&gt;Por favor, verifique as suas credenciais.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;A criação da pasta remota falhou, provavelmente por ter introduzido as credenciais erradas.&lt;/font&gt;&lt;br/&gt;Por favor, verifique as suas credenciais.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>A criação da pasta remota %1 falhou com o erro &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>A sincronização de %1 com a pasta remota %2 foi criada com sucesso.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Conectado com sucesso a %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Não foi possível ligar a %1 . Por Favor verifique novamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Erro ao renomear a pasta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Não é possível remover e fazer backup à pasta porque a pasta ou um ficheiro nesta está aberto em outro programa. Por favor, feche a pasta ou o ficheiro e clique novamente ou cancele a configuração.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Pasta de sincronização local %1 criada com sucesso!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2475,137 +2470,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Hiperligações simbólicas não são suportadas em sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>O ficheiro está na lista de ficheiros a ignorar.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Nomes de ficheiros acabados com um ponto final não são suportados neste sistema de ficheiros.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Nomes de ficheiros que contêm o caractér &apos;%1&apos; não são suportados neste sistema de ficheiros.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>O nome de ficheiro contém pelo menos um carácter inválido</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>O nome de ficheiro é um nome reservado neste sistema de ficheiros.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Nome de ficheiro contém espaços em branco seguidos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>O nome do ficheiro é muito grande</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>O ficheiro/pasta foi ignorado porque está oculto.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Estado falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation>tamanho</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Não autorizado para remoção, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorado devido à blacklist de escolha para sincronização</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Não permitido, porque não tem permissão para adicionar as subpastas nessa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Não permitido, porque não tem permissão para adicionar os ficheiros nessa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido enviar este ficheiro porque este é só de leitura no servidor, a restaurar</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2751,7 +2746,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Código HTTP errado devolvido pelo servidor. Esperado 201, mas foi recebido &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Erro ao escrever a meta-informação par a base de dados</translation>
</message>
@@ -2923,17 +2918,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Protocolo de sincronização local</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar lista de actividades para a área de transferência.</translation>
</message>
@@ -3029,51 +3024,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Definições</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Rede</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Conta</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Atividade</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Geral</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Rede</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Conta</translation>
</message>
@@ -3417,133 +3383,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Partilhar com %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Partilhar...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Enviar hiperligação privada por correio eletrónico...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Eliminar</translation>
</message>
@@ -3761,58 +3727,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Apenas %1 estão disponíveis, é preciso um mínimo de %2 para começar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Conflito por resolver.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Não foi possível ler a lista negra a partir da base de dados local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Não foi possível ler a partir do jornal de sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Impossível abrir o jornal de sincronismo</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation type="unfinished"/>
</message>
@@ -3854,17 +3820,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>O cabeçalho de &quot;checksum&quot; está com problemas.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>O header checksum continha um tipo de checksum desconhecido &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>O ficheiro transferido não corresponde ao &quot;checksum&quot;, Este irá ser retomado.</translation>
</message>
@@ -3908,243 +3874,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Por favor inicie a sessão</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Não há pastas de sincronização configurado.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Iniciar sessão...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Terminar sessão</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Alterações recentes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Pastas Geridas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Abrir pasta &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Estado desconhecido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Sair do %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Desconetado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Versão de servidor não suportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Desligado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Desconetado das contas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Sessão terminada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>A sincronização de contas está desactivada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Erro durante a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Continuar todas as pastas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Pausar todas as pastas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Continuar toda a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Continuar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Pausar toda a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Sair de todas as contas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Entrar em todas as contas...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nova conta...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>Sobre %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Sem itens sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizar %1 de %2 (%3 faltando)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>A sincronizar %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>A sincronizar %1 (%2 em falta)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>A sincronizar %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Atualizado</translation>
</message>
diff --git a/translations/client_pt_BR.ts b/translations/client_pt_BR.ts
index e52841bfe..f2f6bf77c 100644
--- a/translations/client_pt_BR.ts
+++ b/translations/client_pt_BR.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Cancelar</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Conectado com &lt;server&gt; como &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Nenhuma conta configurada.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Adicionar nova</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Remover</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Escolha o que quer sincronizar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Forçar sincronização agora</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Reiniciar a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Remover a conexão de sincronização de pastas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
- <translation type="unfinished"/>
+ <translation>Ativar suporte a arquivos virtuais %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
- <translation type="unfinished"/>
+ <translation> (visualização técnica)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(experimental)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Falha na criação de pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Não foi possível criar pasta local &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Confirme a Remoção de Sincronização de Pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Remover a Conexão de Sincronização de pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation>Desativar o suporte a arquivos virtuais?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -292,168 +292,168 @@ A única vantagem de desativar o suporte a arquivos virtuais é que o recurso de
Esta ação irá anular qualquer sincronização atualmente em execução.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation>Desativar suporte</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Sincronização Acontecendo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>A operação de sincronização está acontecendo.&lt;br/&gt;Você deseja finaliza-la?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 em uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 como &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Conectado a %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>O Servidor %1 está temporariamente indisponível.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Servidor %1 está atualmente em modo de manutenção.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Desconectado de %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Obtendo autorização do navegador. &lt;a href=&apos;%1&apos;&gt;Clique aqui&lt;/a&gt; para reabrir o navegador.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Conectando a %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Sem conexão para %1 em %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Entrar</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Existem pastas que não foram sincronizadas porque são muito grandes:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Existem pastas que não foram sincronizadas porque são armazenamentos externos:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Existem pastas que não foram sincronizadas porque são muito grandes ou armazenamentos externos:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Confirmar a Remoção da Conta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Você realmente deseja remover a conexão desta conta&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Isto &lt;b&gt;não&lt;/b&gt; irá deletar nenhum arquivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Remover conexão</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Abrir pasta</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation>Abrir pasta local</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation>Abra a pasta no navegador</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Resumir sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Pausar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation>Disponibilidade</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation>Desativar o suporte a arquivos virtuais...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Você realmente deseja para a sincronização desta pasta &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Nota:&lt;/b&gt; Isto &lt;b&gt;não&lt;/b&gt; vai deletar qualquer arquivo.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) de%2 em uso. Algumas pastas, incluindo montadas na rede ou pastas compartilhadas, podem ter limites diferenes.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 de %2 em uso</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Atualmente, não há informações de uso de armazenamento disponível.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>A versão do servidor %1 não é suportada! Prossiga por sua conta e risco.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Nenhuma %1 conexão configurada.</translation>
</message>
@@ -604,24 +604,24 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran
<translation>&lt;br/&gt;A conta %1 não tem atividades ativadas.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Você recebeu %n nova notificação de %2.</numerusform><numerusform>Você recebeu %n notificações de %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Você recebeu %n nova notificação de %1 e %2.</numerusform><numerusform>Você recebeu %n novas notificações de %1 e %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Você recebeu novas notificações de %1, %2 e outras contas.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Notificações - Ação Requerida</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -777,8 +777,8 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Erro do servidor: resposta PROPFIND não está formatada em XML!</translation>
</message>
@@ -786,27 +786,27 @@ Esta ação irá anular qualquer sincronização atualmente em execução.</tran
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation>Erro ao abrir o diretório %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Diretório não acessível no cliente, permissão negada</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation>Diretório não encontrado: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>A codificação do nome do arquivo não é válida</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation>Erro ao ler o diretório %1</translation>
</message>
@@ -1364,17 +1364,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
<source>Use virtual files instead of downloading content immediately %1</source>
- <translation type="unfinished"/>
+ <translation>Use arquivos virtuais em vez de baixar o conteúdo imediatamente %1</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="487"/>
<source>(tech preview)</source>
- <translation type="unfinished"/>
+ <translation> (visualização técnica)</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="487"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(experimental)</translation>
</message>
</context>
<context>
@@ -2105,17 +2105,17 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
<source>Use &amp;virtual files instead of downloading content immediately %1</source>
- <translation type="unfinished"/>
+ <translation> Use e arquivos &amp;virtual em vez de baixar o conteúdo imediatamente %1</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
<source>(tech preview)</source>
- <translation type="unfinished"/>
+ <translation> (visualização técnica)</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(experimental)</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
@@ -2242,12 +2242,12 @@ It is not advisable to use it.</source>
<translation>&amp;Póximo &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>URL inválida</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Não foi possível carregar o certificado. Talvez a senha esteja errada?</translation>
</message>
@@ -2260,144 +2260,139 @@ It is not advisable to use it.</source>
<translation>&lt;font color=&quot;green&quot;&gt;Conectado com sucesso a %1: %2 versão %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Falha ao conectar a %1 em %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>O tempo expirou ao tentar contactar %1 e %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Tentando conectar a %1 em %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>A solicitação de autenticação ao servidor foi direcionada para &apos;%1&apos;. A URL está errada, a configuração do servidor está errada.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Houve uma resposta inválida a um pedido de autenticação WebDAV</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Acesso proibido pelo servidor. Para verificar se você tem acesso adequado, &lt;a href=&quot;%1&quot;&gt;clique aqui&lt;/a&gt; para acessar o serviço com o seu navegador.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>URL inválida</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>O servidor informou o seguinte erro:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Pasta local de sincronização %1 já existe, configurando para sincronização. &lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Criação de pasta de sincronização local %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>falhou.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Não foi possível criar pasta local %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Nenhuma pasta remota foi especificada!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Erro: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>criar pasta no ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Pasta remota %1 criada com sucesso.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Pasta remota %1 já existe. Conectando para sincronizar.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>A criação da pasta resultou em um erro do código HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>A criação da pasta remota falhou porque as credenciais fornecidas estão erradas!&lt;br/&gt;Por favor, volte e verifique suas credenciais.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;A criação remota de pasta falhou provavelmente as causas da falha na criação da pasta remota são credenciais erradas&lt;/font&gt;&lt;br/&gt;Volte e verifique suas credenciais, por favor.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Falha na criação da pasta remota %1 com erro &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Uma conexão de sincronização de %1 para o diretório remoto %2 foi realizada.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Conectado com sucesso a %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Conexão à %1 não foi estabelecida. Por favor, verifique novamente.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Falha no nome da pasta</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Não é possível remover e fazer backup da pasta porque a pasta ou um arquivo que está nesta pasta está aberto em outro programa. Por favor, feche a pasta ou arquivo e clique tentar novamente ou cancelar a operação.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Pasta de sincronização local %1 criada com sucesso!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2412,24 +2407,27 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
<source>Enable technical preview feature?</source>
- <translation type="unfinished"/>
+ <translation>Ativar recurso de visualização técnica?</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
- <translation type="unfinished"/>
+ <translation>Quando o modo &quot;arquivos virtuais&quot; está ativado, nenhum arquivo será baixado inicialmente. Em vez disso, um arquivo virtual será criado para cada arquivo que existe no servidor. Quando um arquivo é aberto, seu conteúdo é baixado automaticamente. Como alternativa, os arquivos podem ser baixados manualmente usando o menu de contexto.
+
+O modo de arquivos virtuais é mutuamente exclusivo com sincronização seletiva. As pastas não selecionadas no momento serão traduzidas para pastas somente on-line e suas configurações de sincronização seletiva serão redefinidas.</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
<source>Enable virtual files</source>
- <translation type="unfinished"/>
+ <translation>Ativar arquivos virtuais</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
<source>Continue to use selective sync</source>
- <translation type="unfinished"/>
+ <translation>Continuar a usar sincronizações seletivas</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
@@ -2439,7 +2437,7 @@ The virtual files mode is mutually exclusive with selective sync. Currently unse
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
<source>Enable experimental placeholder mode</source>
- <translation type="unfinished"/>
+ <translation> Ativar modo experimental de espaço reservado</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
@@ -2493,137 +2491,137 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Linques simbólicos não são suportados em sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>O arquivo está listado na lista de ignorados.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Os nomes de arquivos que terminam com um ponto não são suportados neste sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Os nomes de arquivos que contêm o caractere &apos;%1&apos; não são suportados neste sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>O nome do arquivo contem pelo menos um caractere inválido </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>O nome do arquivo é um nome reservado neste sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>O nome do arquivo contém espaços deixados para trás.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>O nome do arquivo é muito longo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Arquivo/pasta ignorado porque porque está escondido.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Stat falhou.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Conflito: Versão do servidor baixada, cópia local renomeada e não carregada.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>O nome do arquivo não pode ser codificado em seu sistema de arquivos.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation>O nome do arquivo está na lista negra no servidor.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation>Arquivo tem extensão reservada para arquivos virtuais.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation>tamanho</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation>permissões</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation>etag</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation>id do arquivo</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation>servidor relatou não %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
- <translation type="unfinished"/>
+ <translation> Movido para destino inválido, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Não é permitido remover, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorado por causa da lista negra &quot;escolher o que sincronizar&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Não permitido porque você não tem permissão para adicionar subpastas para essa pasta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Não permitido porque você não tem permissão para adicionar arquivos na pasta</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Não é permitido fazer o upload deste arquivo porque ele é somente leitura no servidor, restaurando</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation>Erro ao ler o banco de dados</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation>Servidor respondeu com um erro ao ler o diretório &apos;%1&apos; : %2</translation>
</message>
@@ -2769,7 +2767,7 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Código HTTP retornado errado pelo servidor. 201 esperado, mas recebeu &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Ocorreu um erro ao escrever metadados ao banco de dados</translation>
</message>
@@ -2941,17 +2939,17 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Tamanho</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Protocolo de sincronização local</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Copiar</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Copiar a lista de atividades para a área de transferência.</translation>
</message>
@@ -3047,51 +3045,22 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>Configurações</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
- <source>Activity</source>
- <translation>Atividade</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
- <source>General</source>
- <translation>Geral</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
- <source>Network</source>
- <translation>Rede</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Conta</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Atividade</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Geral</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Rede</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Conta</translation>
</message>
@@ -3435,48 +3404,48 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Compartilhar com %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation>Compartilhar contexto do menu</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation>Compartilhar o contexto do menu %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation>Confirme a exclusão</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation>Você deseja excluir o diretório &lt;i&gt;%1&lt;/i&gt; e todo o seu conteúdo permanentemente?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation>Você quer apagar o arquivo &lt;i&gt;%1&lt;/i&gt; permanentemente?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation>Selecione um novo local...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Erro</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
@@ -3485,85 +3454,85 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
%1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>Eu compartilhei algo com você</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Compartilhar...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Copie o linque privado para a área de transferência</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Envie o linque privado por e-mail...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>Não é permitido compartilhar novamente este arquivo</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation>Não é permitido compartilhar novamente esta pasta</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Copiar linque público para a área de transferência</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation>Mostrar versões de arquivos no navegador</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation>Renomear</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation>Renomeie e faça o upload...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation>Mover e renomear...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation>Mova, renomeie e faça o upload...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation>Excluir alterações locais</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation>Mover e enviar...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Excluir</translation>
</message>
@@ -3781,58 +3750,58 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<translation>%1 (ignorado devido a um erro anterior, tentando novamente em %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Apenas %1 estão disponíveis, precisamos de pelo menos %2 para começar</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Não é possível abrir ou criar o banco de dados de sincronização local. Certifique-se de ter acesso de gravação na pasta de sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>O espaço em disco é pequeno: Os downloads que reduzam o espaço livre abaixo de %1 foram ignorados.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>Há espaço disponível no servidor para alguns envios.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Conflito não solucionado.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation>Não foi possível atualizar os metadados do arquivo virtual: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Usando arquivos virtuais com sufixo, mas o sufixo não está definido</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Não é possível ler a lista negra a partir do banco de dados local</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Não é possível ler a partir do relatório de sincronização.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Não é possível abrir o arquivo de sincronização</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Abortado</translation>
</message>
@@ -3875,17 +3844,17 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>O cabeçalho da soma de verificação está incorreto.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>A cabeçalho da soma de verificação continha um tipo de soma de verificação desconhecido &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>O arquivo baixado não coincide com o checksum, ele será retomado.</translation>
</message>
@@ -3929,243 +3898,243 @@ Este é um novo modo experimental. Se você decidir usá-lo, relate quaisquer pr
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Favor conectar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Pasta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Não há pastas de sincronização configuradas.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Abrir no navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Entrar...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Sair</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Alterações Recentes</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Pastas Gerenciadas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Abrir pasta &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Abrir %1 no navegador</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>O servidor na conta %1 executa uma versão não suportada %2. A utilização deste cliente com versões de servidor não suportadas não foi testada e é potencialmente perigosa. Prossiga por sua conta e risco.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Status desconhecido</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Configurações...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Detalhes...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Ajuda</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Sair %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Desconectado de %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Versão do Servidor Não Suportada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>Desconectado de algumas contas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Desconectado de contas:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Conta %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Desconectado</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>A sincronização de conta está desativada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>A sincronização está pausada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>Conflitos não resolvidos</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Erro durante a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Nenhuma pasta de sincronização configurada</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Retomar todas as pastas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Pausar todas as pastas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Retomar toda a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Retomar sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Dar uma pausa em toda a sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Dar uma pausa na sincronização</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Desconectar todas as contas</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Conectar todas as contas...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nova conta...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>Sobre %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Não há itens sincronizados recentemente</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Verificando alterações remotamente &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Verificação de alterações local &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Sincronizar %1 de %2 (%3 faltando)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Sincronizando %1 de %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Sincronizando %1 (%2 faltando)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Sincronizando %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Até a data</translation>
</message>
diff --git a/translations/client_ru.ts b/translations/client_ru.ts
index 22420c68e..17a07dc99 100644
--- a/translations/client_ru.ts
+++ b/translations/client_ru.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Отмена</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Подключен к &lt;server&gt; как &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Учётная запись не настроена.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Добавить новую</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Удалить</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Уч.запись</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Выбрать объекты для синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Принудительно синхронизовать сейчас</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Перезапустить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Удалить подключение синхронизации каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation>Включить поддержку виртуального файла %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation>(техническая демонстрация)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation>(экспериментальное)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Ошибка создания каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Не удалось создать локальный каталог &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Подтвердите удаление подключения синхронизации каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Удалить подключение синхронизации каталога</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation>Отключить поддержку виртуальных файлов?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -292,168 +292,168 @@ This action will abort any currently running synchronization.</source>
Это действие прервёт любую работающую сейчас синхронизацию.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation>Отключить поддержку</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Синхронизация запущена</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Выполняется синхронизация.&lt;br/&gt;Вы хотите её остановить?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 используется</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 как &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Соединен с %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Сервер %1 временно недоступен.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Сервер %1 в настоящее время находится в режиме технического обслуживания.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Успешно вышли из %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Получение авторизации из браузера. &lt;a href=&apos;%1&apos;&gt;Нажмите здесь&lt;/a&gt;, чтобы повторно открыть браузер.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Соединение с %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Нет соединения с %1 в %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Войти</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Есть каталоги, которые не были синхронизированы, так как они слишком большие:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Есть каталоги, которые не были синхронизированы, так как они являются внешними хранилищами:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Есть каталоги, которые не были синхронизированы, так как они слишком велики или являются внешними хранилищами:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Подтверждение удаления учетной записи</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Вы действительно желаете удалить подключение к учетной записи &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Примечание:&lt;/b&gt; Это действие &lt;b&gt;НЕ&lt;/b&gt; удалит ваши файлы.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Удалить подключение</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Открыть папку</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Выйти</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation>Открыть локальный каталог</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation>Открыть каталог в браузере</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Возобновить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Приостановить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation>Доступность</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation>Отключить поддержку виртуальных файлов…</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Вы действительно желаете остановить синхронизацию папки &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Примечание:&lt;/b&gt; Это действие &lt;b&gt;НЕ&lt;/b&gt; удалит ваши файлы.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) из %2 используется. Некоторые папки, включая сетевые или общие, могут иметь свои собственные ограничения.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 из %2 используется</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>В данный момент информация о заполненности хранилища недоступна.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>Версия сервера %1 не поддерживается! Продолжайте на свой страх и риск.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Нет настроенного подключения %1.</translation>
</message>
@@ -604,24 +604,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;У учетной записи %1 не включены события.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Вы получили %n новое уведомление от %2.</numerusform><numerusform>Вы получили %n новых уведомления от %2.</numerusform><numerusform>Вы получили %n новых уведомлений от %2.</numerusform><numerusform>Вы получили %n новых уведомлений от %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Вы получили %n новое уведомление от %1 и %2.</numerusform><numerusform>Вы получили %n новых уведомления от %1 и %2.</numerusform><numerusform>Вы получили %n новых уведомлений от %1 и %2.</numerusform><numerusform>Вы получили %n новых уведомлений от %1 и %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Для Вас получено %n новых уведомлений из %1, %2 и других уч.записей.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 уведомлений - требуются действия.</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -777,8 +777,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>Ошибка сервера: Ответ на PROPFIND не в формате XML!</translation>
</message>
@@ -786,27 +786,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation>Ошибка при открытии каталога %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation>Каталог не доступен на клиенте, доступ запрещён</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation>Каталог не найден: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Кодировка имени файла не верна</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation>Ошибка при чтении каталога %1</translation>
</message>
@@ -2245,12 +2245,12 @@ It is not advisable to use it.</source>
<translation>&amp;Далее &gt; </translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>Неверная ссылка</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Не удалось загрузить сертификат. Возможно, неверен пароль?</translation>
</message>
@@ -2263,144 +2263,139 @@ It is not advisable to use it.</source>
<translation>&lt;font color=&quot;green&quot;&gt;Успешное подключение к %1: %2 версия %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Не удалось подключиться к %1 в %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Превышено время ожидания соединения к %1 на %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Попытка соединиться с %1 на %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>Запрос авторизации с сервера перенаправлен на &apos;%1&apos;. Ссылка не верна, сервер не настроен.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Обнаружен не верный ответ на авторизованный запрос WebDAV</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Доступ запрещён сервером. Чтобы доказать, что у Вас есть права доступа, &lt;a href=&quot;%1&quot;&gt;нажмите здесь&lt;/a&gt; для входа через Ваш браузер.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>Неверная ссылка</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>Сервер выдал следующую ошибку:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Локальный каталог синхронизации %1 уже существует, используем его для синхронизации.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Создание локальной папки синхронизации %1... </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>ок</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>не удалось.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Не удалось создать локальный каталог синхронизации %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Не указан удалённый каталог!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Ошибка: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>создание каталога на ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Удалённый каталог %1 успешно создан.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Удалённый каталог %1 уже существует. Подключение к нему для синхронизации.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Создание каталога завершилось с HTTP-ошибкой %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>Не удалось создать удаленный каталог, так как представленные параметры доступа неверны!&lt;br/&gt;Пожалуйста, вернитесь назад и проверьте учетные данные.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Не удалось создать удаленный каталог, возможно, указанные учетные данные неверны.&lt;/font&gt;&lt;br/&gt;Вернитесь назад и проверьте учетные данные.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Удаленный каталог %1 не создан из-за ошибки &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Установлено соединение синхронизации %1 к удалённому каталогу %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Соединение с %1 установлено успешно!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Не удалось соединиться с %1. Попробуйте снова.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Ошибка переименования каталога</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Невозможно удалить каталог и создать его резервную копию, каталог или файл в ней открыт в другой программе. Закройте каталог или файл и нажмите &quot;Повторить попытку&quot;, либо прервите мастер настройки.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Локальный каталог синхронизации %1 успешно создан!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2498,137 +2493,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Синхронизация символических ссылок не поддерживается.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Файл присутствует в списке игнорируемых.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Эта файловая система не поддерживает имена файлов, оканчивающиеся на точку.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Эта файловая система не поддерживает имена файлов, содержащие символ &apos;%1&apos;.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Имя файла содержит по крайней мере один некорректный символ</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Данное имя файла зарезервировано в данной файловой системе.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Имя файла содержит пробелы на конце.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Имя файла слишком длинное.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Файл/папка проигнорированы, так как являются скрытыми.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Не удалось загрузить статистику.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Конфликт: Серверная версия скачана, локальная копия переименована и не закачана.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>Невозможно перекодировать имя файла для вашей системы.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation>Имя файла находится в чёрном списке сервера.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation>Расширение имён файлов, выделенное для виртуальных файлов.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation>размеру</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation>разрешения</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation>etag</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation>код файла</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation>Сервер вернул отсутствие %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation>Перемещение в недопустимое место, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Не допускается удаление, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Игнорируется из-за черного списка в &quot;что синхронизировать&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление подпапок в папку.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Не разрешается, так как у вас нет полномочий на добавление файлов в эту папку</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Не допускается загрузка этого файла, так как на сервере он помечен только для чтения, восстанавливаем</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation>Ошибка при чтении базы данных</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation>Сервер ответил ошибкой при чтении каталога &apos;%1&apos; : %2</translation>
</message>
@@ -2774,7 +2769,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Сервер ответил не правильным HTTP кодом. Ожидался 201, но получен &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Ошибка записи метаданных в базу данных</translation>
</message>
@@ -2946,17 +2941,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Размер</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Локальный протокол синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Копировать</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Скопировать журнал синхронизации в буфер обмена.</translation>
</message>
@@ -3052,51 +3047,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Настройки</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>События</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Основные</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Сеть</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Уч.запись</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>События</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Основные</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Сеть</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Уч.запись</translation>
</message>
@@ -3440,48 +3406,48 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Поделиться с %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation>Доступ через контекстное меню</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation>Доступ через контекстное меню к %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation>Подтвердите удаление</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation>Хотите окончательно удалить каталог &lt;i&gt;%1&lt;/i&gt;, и всё его содержимое?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation>Хотите окончательно удалить файл &lt;i&gt;%1&lt;/i&gt;?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation>Выберите новое местоположение…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Ошибка</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
@@ -3490,85 +3456,85 @@ This is a new, experimental mode. If you decide to use it, please report any iss
%1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>Я поделился с тобой</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Поделиться...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Копировать приватную ссылку в буфер обмена...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Отправить приватную ссылку по email...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>Повторное предоставление доступа к этому файлу не разрешено</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation>Повторное предоставление доступа к этому каталогу не разрешено</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>Копировать общую ссылку в буфер обмена</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Открыть в браузере</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation>Показать версии файла в браузере</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation>Переименовать…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation>Переименовать и закачать…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation>Переместить и переименовать…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation>Переместить, переименовать, и закачать…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation>Удалить локальные изменения</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation>Переместить и закачать…</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Удалить</translation>
</message>
@@ -3786,58 +3752,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 (пропущено из-за предыдущей ошибки, повторная попытка через %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Только %1 доступно, нужно как минимум %2 чтобы начать</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Не могу открыть или создать локальную базу данных синхронизации. Удостоверьтесь, что у вас есть доступ на запись в каталог синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>Мало места на диске: Скачивания, которые сократят свободное место ниже %1, будут пропущены.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>На сервере недостаточно места для некоторых закачек.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Неразрешённый конфликт.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation>Не удалось обновить метаданные виртуального файла: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>Используются виртуальные файлы с суффиксом, но суффикс не задан</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Не удалось прочитать файл чёрного списка из локальной базы данных.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Не удалось прочитать из журнала синхронизации.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Не удаётся открыть журнал синхронизации</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Прервано</translation>
</message>
@@ -3879,17 +3845,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>Некорректная контрольная сумма заголовка</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Заголовок контрольной суммы содержал неизвестный тип &apos;%1&apos; контрольной суммы</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Загруженный файл не соответствует контрольной сумме, операция будет возобновлена.</translation>
</message>
@@ -3933,243 +3899,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Пожалуйста войдите в систему</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Каталог %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Нет настроенных каталогов для синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Открыть в браузере</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Вход...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Выйти</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Недавние изменения</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Управляемые каталоги:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Открыть каталог &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Открыть %1 в браузере</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>Учётная запись сервера %1 работает с неподдерживаемой версией %2. Использование клиента с неподдерживаемой версией сервера не тестировалось и потенциально опасно. Продолжайте на свой страх и риск.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Неизвестный статус</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Настройки...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Детали...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Помощь</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Закрыть %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Отключен от %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Версия сервера не поддерживается</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Отключено</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>Отключено от некоторых учётных записей</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Отключен от учетных записей:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Учетная запись %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Вышли из аккаунта</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>Синхронизация учётной записи отключена</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>Синхронизация приостановлена</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>Неразрешённые конфликты</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Ошибка во время синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Не настроено ни одного каталога для синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Снять с паузы все папки</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Поставить на паузу все папки</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Возобновить все синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Возобновить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Приостановить все синхронизации</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Приостановить синхронизацию</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Выйти из всех учетных записей</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Войти во все учетные записи...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Новая учётная запись…</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>Про %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Недавно ничего не синхронизировалось</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Проверяю измененеия в удалённом &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Проверяю изменения в локальном &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Синхронизация %1 из %2 (осталось %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Синхронизирую %1 из %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Синхронизация %1 (осталось %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Синхронизация %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Актуальная версия</translation>
</message>
diff --git a/translations/client_sl.ts b/translations/client_sl.ts
index c142f36e1..b5e1490dc 100644
--- a/translations/client_sl.ts
+++ b/translations/client_sl.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Prekliči</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Vzpostavljena je povezava s strežnikom &lt;server&gt; kot &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Ni nastavljenega računa.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Dodaj novo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Odstrani</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Račun</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Izbor predmetov za usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Vsili takojšnje usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Ponovno zaženi usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Odstrani povezavo mape usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Ustvarjanje mape je spodletelo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Ni mogoče ustvariti krajevne mape &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Potrdi odstranjevanje povezave usklajevanja mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Odstrani povezavo usklajevanja mape</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -288,168 +288,168 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Usklajevanje je v teku</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Izvaja se usklajevanje.&lt;br/&gt;Ali želite opravilo prekiniti?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 v uporabi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 kot &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Povezano z %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Strežnik %1 trenutno ni dosegljiv.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Strežnik %1 je trenutno v vzdrževalnem načinu.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Uspešno odjavljeno iz %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Poteka pridobivanje overitve brskalnika. &lt;a href=&apos;%1&apos;&gt;Kliknite&lt;/a&gt; za ponovno odpiranje brskalnika.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Poteka vzpostavljanje povezave s strežnikom %1 ...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Ni povezave z %1 pri %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Prijava</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Zaznane so mape, ki zaradi omejitve velikosti niso bile usklajene: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Zaznane so mape, ki zaradi pripadnosti zunanji shrambi niso bile usklajene: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Zaznane so mape, ki zaradi omejitve velikosti ali pripadnosti zunanji shrambi niso bile usklajene: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Potrdi odstranitev računa</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ali res želite odstraniti povezavo z računom &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opomba:&lt;/b&gt; S tem &lt;b&gt;ne bo&lt;/b&gt; izbrisana nobena datoteka.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Odstrani povezavo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Odpri mapo</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Odjava</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Nadaljuj z usklajevanjem</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Premor usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Ali res želite zaustaviti usklajevanje mape &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Opomba:&lt;/b&gt; s tem datoteke iz odjemalca &lt;b&gt;ne bodo&lt;/b&gt; odstranjene.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) od %2 v uporabi. Nekatere mape, vključno s priklopljenimi mapami in mapami v souporabi, imajo morda različne omejitve.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 od %2 v uporabi</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Trenutno ni na voljo nobenih podatkov o porabi prostora.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Ni nastavljene povezave %1.</translation>
</message>
@@ -600,24 +600,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;Za račun %1 možnosti opravil niso omogočene.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Prejeli ste %n novo obvestilo od %2.</numerusform><numerusform>Prejeli ste %n novi obvestili od %2.</numerusform><numerusform>Prejeli ste %n nova obvestila od %2.</numerusform><numerusform>Prejeli ste %n novih obvestil od %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Prejeli ste %n novo obvestilo od %1 in %2.</numerusform><numerusform>Prejeli ste %n novi obvestili od %1 in %2.</numerusform><numerusform>Prejeli ste %n nova obvestila od %1 in %2.</numerusform><numerusform>Prejeli ste %n novih obvestil od %1 in %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Prejeli ste nova obvestila prek %1, %2 in drugih računov.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 obvestil ‒ zahtevajo odziv</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,8 +773,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -782,27 +782,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Kodni zapis imena datoteke ni veljaven.</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -2230,12 +2230,12 @@ Uporaba ni priporočljiva.</translation>
<translation>&amp;Naslednja &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>Neveljaven naslov URL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"/>
</message>
@@ -2248,144 +2248,139 @@ Uporaba ni priporočljiva.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Uspešno vzpostavljena povezava z %1: %2 različica %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Povezava z %1 pri %2 je spodletela:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Prekinitev med poskusom povezave na %1 pri %2.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Poteka poskus povezave z %1 na %2 ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>Zahteva za overitev s strežnikom je bila preusmerjena na &apos;%1&apos;. Naslov URL ni veljaven ali pa strežnik ni ustrezno nastavljen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Prejet je neveljaven odziv na zahtevo overitve webdav</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Strežnik ne dovoli dostopa. Če želite preveriti, ali imate ustrezen dostop, &lt;a href=&quot;%1&quot;&gt;kliknite tu&lt;/a&gt; za dostop do te storitve z brskalnikom.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>Neveljaven naslov URL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation type="unfinished"/>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Krajevna mapa %1 že obstaja. Nastavljena bo za usklajevanje.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Ustvarjanje mape za krajevno usklajevanje %1 ... </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>je v redu</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>je spodletelo.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Krajevne mape %1 ni mogoče ustvariti.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Ni navedenega oddaljenega strežnika!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Napaka: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>ustvarjanje mape v oblaku ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Oddaljena mapa %1 je uspešno ustvarjena.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Oddaljena mapa %1 že obstaja. Vzpostavljena bo povezava za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Ustvarjanje mape je povzročilo napako HTTP %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>Ustvarjanje mape na oddaljenem naslovu je spodletelo zaradi napačnih poveril. &lt;br/&gt;Vrnite se in preverite zahtevana gesla.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Ustvarjanje oddaljene mape je spodletelo. Najverjetneje je vzrok v neustreznih poverilih.&lt;/font&gt;&lt;br/&gt;Vrnite se na predhodno stran in jih preverite.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Ustvarjanje oddaljene mape %1 je spodletelo z napako &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>Povezava za usklajevanje med %1 in oddaljeno mapo %2 je vzpostavljena.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Povezava z %1 je uspešno vzpostavljena!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Povezave z %1 ni mogoče vzpostaviti. Preveriti je treba nastavitve.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Preimenovanje mape je spodletelo</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Mape ni mogoče odstraniti niti ni mogoče ustvariti varnostne kopije, saj je mapa oziroma dokument v njej odprt z drugim programom. Zaprite mapo/dokument ali prekinite namestitev.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Krajevno usklajena mapa %1 je uspešno ustvarjena!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2475,137 +2470,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Usklajevanje simbolnih povezav ni podprto.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Datoteka je na seznamu prezrtih datotek.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Imena datotek, ki vsebujejo piko, na tem sistemu niso podprta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Imena datotek, ki vsebujejo znak »%1«, na tem sistemu niso podprta.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Ime datoteke vsebuje vsaj en neveljaven znak.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Ime datoteke je na tem sistemu zadržano za sistemsko datoteko.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Datoteka vsebuje pripete presledne znake</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Ime datoteke je predolgo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Datoteka/Mapa je prezrta, ker je skrita.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Določanje statističnih podatkov je spodletelo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Odstranitev ni dovoljena, datoteka bo obnovljena.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Prezrto, ker je predmet označen na črni listi za usklajevanje</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Dejanje ni dovoljeno! Ni ustreznih dovoljenj za dodajanje podmap v to mapo.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Dejanje ni dovoljeno, ker ni ustreznih dovoljenj za dodajanje datotek v to mapo</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Ni dovoljeno pošiljati te datoteke, ker ima določena dovoljenja le za branje. Datoteka bo obnovljena na izvorno različico.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2751,7 +2746,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>S strežnika je vrnjen neveljaven odziv HTTP. Pričakovan je 201, prejet pa je bil &quot;%1 %2&quot;.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Napaka zapisovanja metapodatkov v podatkovno zbirko</translation>
</message>
@@ -2923,17 +2918,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Velikost</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Krajevni protokol usklajevanja</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Kopiraj</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiraj seznam opravil v odložišče.</translation>
</message>
@@ -3029,51 +3024,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Nastavitve</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
- <source>Activity</source>
- <translation>Dejavnosti</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
- <source>General</source>
- <translation>Splošno</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
- <source>Network</source>
- <translation>Omrežje</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Račun</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Dejavnosti</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Splošno</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Omrežje</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Račun</translation>
</message>
@@ -3417,133 +3383,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Omogoči souporabo z %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Napaka</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Omogoči souporabo ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Odpri v brskalniku</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Izbriši</translation>
</message>
@@ -3761,58 +3727,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Le %1 je na voljo, zahtevanih pa je vaj %2 za zagon</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Nerazrešen spor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Ni mogoče prebrati črnega seznama iz krajevne mape</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Ni mogoče brati iz dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Ni mogoče odpreti dnevnika usklajevanja</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Prekinjeno</translation>
</message>
@@ -3854,17 +3820,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>Glava nadzorne vsote je napačno oblikovana.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Glava nadzorne vsote vsebuje neznano vrsto zapisa &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Prejeta datoteka ni skladna z nadzorno vsoto te datoteke, zato bo prenos ponovljen.</translation>
</message>
@@ -3908,243 +3874,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Pred nadaljevanjem je zahtevana prijava</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Mapa %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Ni nastavljenih map za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Odpri v brskalniku</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Prijava ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Odjava</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Nedavne spremembe</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Upravljane mape:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Odpri mapo &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Odpri %1 v brskalniku</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Neznano stanje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Nastavitve ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Podrobnosti ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Pomoč</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Končaj %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Prekinjena povezava z %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Nepodprta različica strežnika</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Brez povezave</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Prekinjena je povezava z računi:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Račun %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Odjavljeno</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>Usklajevanje računa je onemogočeno</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>Usklajevanje je v premoru</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Med usklajevanjem je prišlo do napake</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Ni nastavljenih map za usklajevanje.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Nadaljuj usklajevanje vseh map</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Ustavi usklajevanje vseh map</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Nadaljuj usklajevanje vsega</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Nadaljuj usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Ustavi vse usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Ustavi usklajevanje</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Odjavi vse račune</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Prijavi z vsemi računi ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nov račun ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>O %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Ni nedavno usklajenih predmetov</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Poteka usklajevanje %1 od %2 (preostaja %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Poteka usklajevanje %1 od %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Usklajevanje %1 (%2 do konca)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Usklajevanje %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Ni posodobitev</translation>
</message>
diff --git a/translations/client_sv.ts b/translations/client_sv.ts
index 84f59e280..c38820b1a 100644
--- a/translations/client_sv.ts
+++ b/translations/client_sv.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>Avbryt</translation>
</message>
@@ -199,87 +199,87 @@
<translation>Ansluten till &lt;server&gt; som &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Inget konto är konfigurerat.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Lägg till ny</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Radera</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Konto</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Välj vad som ska synkas</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Tvinga synkning</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Starta om synkning</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Ta bort anslutning till mappsynkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Kunde inte skapa mappen</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;Kunde inte skapa lokal mapp &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Bekräfta radering av anslutning till mappsynkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Ta bort anslutning till mappsynkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -288,168 +288,168 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Synkronisering pågår</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>En synkronisering pågår.&lt;br/&gt;Vill du avbryta den?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 används</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 som &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>Ansluten till %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>Servern %1 är för tillfället inte tillgänglig.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Servern %1 är för närvarande i underhållsläge.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>Utloggad från %1.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Anskaffar autentisering från webbläsaren. &lt;a href=&apos;%1&apos;&gt;Klicka här &lt;/a&gt; för att öppna webbläsaren igen.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Ansluter till %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>Ingen anslutning till %1 vid %2.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Logga in</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Dessa mappar har inte synkroniserats för att de är för stora:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Det finns mappar som inte synkroniserats för att de är externa lagringsytor:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Det finns mappar som inte blivit synkroniserade på grund av att de är för stora eller är externa lagringsytor: </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Bekräfta radering an kontot</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vill du verkligen avsluta anslutningen till kontot &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Observera:&lt;/b&gt; Detta kommer &lt;b&gt;inte&lt;/b&gt; radera några filer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Radera anslutning</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Öppna mapp</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Logga ut</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Återuppta synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Pausa synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;Vill du verkligen avbryta synkronisering av mappen &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Observera:&lt;/b&gt; Detta kommer &lt;b&gt;inte&lt;/b&gt; radera några filer.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) av %2 används. Vissa mappar, inklusive nätverks- eller delade mappar, kan ha andra begränsningar.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 av %2 används</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Just nu finns ingen utrymmes information tillgänglig</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Ingen %1 anslutning konfigurerad.</translation>
</message>
@@ -600,24 +600,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;Kontot %1 har inte aktiviteter aktiverade</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>Du har mottagit %n ny notifiering från %2.</numerusform><numerusform>Du har mottagit %n nya notifieringar från %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>Du tog emot %1 ny notis från %1 och %2.</numerusform><numerusform>Du tog emot %n nya notiser från %1 och %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>Du tog emot nya notiser från %1, %2 och andra konton.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Notiser - Åtgärd krävs</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,8 +773,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -782,27 +782,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Filnamnskodning är inte giltig</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -2225,12 +2225,12 @@ Det är inte lämpligt använda den.</translation>
<translation>&amp;Nästa &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>Ogiltig URL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation type="unfinished"/>
</message>
@@ -2243,144 +2243,139 @@ Det är inte lämpligt använda den.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;Lyckades ansluta till %1: %2 version %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>Misslyckades att ansluta till %1 vid %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>Försök att ansluta till %1 på %2 tog för lång tid.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>Försöker ansluta till %1 på %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>Den autentiserade begäran till servern omdirigerades till &apos;%1&apos;. Den URLen är ogiltig, server är felkonfigurerad.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Det kom ett ogiltigt svar på en autentiserad webdav-begäran</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Åtkomst förbjuden av servern. För att bekräfta att du har korrekta rättigheter, &lt;a href=&quot;%1&quot;&gt;klicka här&lt;/a&gt; för att ansluta till tjänsten med din webb-läsare.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>Ogiltig URL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>Servern svarade med följande fel:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Lokal synkmapp %1 finns redan, aktiverar den för synk.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Skapar lokal synk-mapp %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>ok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>misslyckades.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>Kunde inte skapa lokal mapp %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Ingen fjärrmapp specificerad! </translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Fel: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>skapar mapp på ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>Fjärrmapp %1 har skapats.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Fjärrmappen %1 finns redan. Ansluter den för synkronisering.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Skapande av mapp resulterade i HTTP felkod %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>Det gick inte att skapa mappen efter som du inte har tillräckliga rättigheter!&lt;br/&gt;Vänligen återvänd och kontrollera dina rättigheter.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Misslyckades skapa fjärrmappen, troligen p.g.a felaktiga inloggningsuppgifter.&lt;/font&gt;&lt;br/&gt;Kontrollera dina inloggningsuppgifter.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Misslyckades skapa fjärrmapp %1 med fel &lt;tt&gt;%2&lt;/tt&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>En synkroniseringsanslutning från %1 till fjärrmappen %2 har skapats.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>Ansluten till %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>Anslutningen till %1 kunde inte etableras. Var god kontrollera och försök igen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Omdöpning av mapp misslyckades</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Kan inte ta bort och göra en säkerhetskopia av mappen på grund av att mappen eller en fil i den används av ett annat program. Vänligen stäng mappen eller filen och försök igen eller avbryt installationen.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Lokal synkmapp %1 skapad!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2470,137 +2465,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Symboliska länkar stöds ej i synkningen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Filen är listad i ignorerings listan.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>Filnamn som slutar med punkt stöds inte i det här filsystemet.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>Filnamn som innehåller tecknet &apos;%1&apos; stöds inte i det här filsystemet.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Filnamnet innehåller minst ett ogiltigt tecken</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Filnamnet är ett reserverat namn i detta filsystemet.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>Filnamn innehåller mellanslag i slutet.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Filnamnet är för långt.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Filen/Mappen är ignorerad för att den är dold.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Stat misslyckades.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>Konflikt: Serverversion nedladdad, lokal kopia omdöpt och ej uppladdad.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Inte behörig att radera, återställer</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>Ignorerad eftersom den är svartlistad i &quot;välj vad som ska synkas&quot; </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till undermappar i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Otillåtet eftersom du inte har rättigheter att lägga till filer i den mappen.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Inte behörig att ladda upp denna fil då den är skrivskyddad på servern, återställer </translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2746,7 +2741,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Felaktig HTTP-kod i svaret från servern. &apos;201&apos; förväntades, men &quot;%1 %2&quot; mottogs.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Fel vid skrivning av metadata till databasen</translation>
</message>
@@ -2918,17 +2913,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Storlek</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Lokalt synkprotokoll</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Kopiera</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Kopiera aktivitetslistan till urklipp.</translation>
</message>
@@ -3024,51 +3019,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Inställningar</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Aktivitet</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Allmänt</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Nätverk</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Konto</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Aktivitet</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Allmänt</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Nätverk</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Konto</translation>
</message>
@@ -3412,133 +3378,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>Dela med %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Fel</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>Jag delade något med dig</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Dela...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>Kopiera privat länk till urklipp</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>Skicka privat länk med e-post...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Öppna i webbläsare</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Ta bort</translation>
</message>
@@ -3756,58 +3722,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 (skippad på grund av ett tidigare fel, försök igen om %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Endast %1 tillgängligt, behöver minst %2 för att starta</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>Kunde inte öppna eller återskapa den lokala synkroniseringsdatabasen. Säkerställ att du har skrivrättigheter till synkroniseringsmappen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>Diskutrymmet är lågt: Nedladdningar som reduceringar det fria utrymmet under %1 skippades.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>Det finns inte tillräckligt med utrymme på servern för vissa uppladdningar.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>Olöst konflikt.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Kunde inte läsa svartlistan från den lokala databasen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Kunde inte läsa från synk-journalen.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Kunde inte öppna synk journalen</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>Avbrutits</translation>
</message>
@@ -3849,17 +3815,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>Checksummans huvud är felformaterad.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Checksummans huvud innehåller en okänd checksumma av typ &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>Den nedladdade filen stämmer inte med checksumman, den kommer startas om.</translation>
</message>
@@ -3903,243 +3869,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Vänliga logga in</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Mapp %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Det finns inga synkmappar konfigurerade.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Öppna i webbläsare</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Logga in...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Logga ut</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Senaste ändringar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Hanterade mappar:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>Öppna mapp &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>Öppna %1 i webbläsaren</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Okänd status</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Inställningar...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Detaljer...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Hjälp</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>Avsluta %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>Koppla från %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Serverversion stöds inte</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Bortkopplad</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Bortkopplad från dessa konton:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Konto %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Utloggad</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>Synkronisering för konto är avstängd</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>Fel vid synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>Inga mappar valda för synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Sluta pausa alla mappar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Pausa alla mappar</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Sluta pausa all synkroinisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Sluta pausa synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Pausa all synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Pausa synkronisering</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Logga ut från alla konton</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Logga in på alla konton...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Nytt konto...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>Om %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Inga filer har synkroniseras nyligen</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Synkroniserar %1 av %2 (%3 kvar)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>Synkroniserar %1 av %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Synkroniserar %1 (%2 kvar)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>Synkroniserar %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Aktuell version</translation>
</message>
diff --git a/translations/client_th.ts b/translations/client_th.ts
index d53a1f0cc..664e969e2 100644
--- a/translations/client_th.ts
+++ b/translations/client_th.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>ยกเลิก</translation>
</message>
@@ -199,87 +199,87 @@
<translation>เชื่อมต่อกับ &lt;server&gt; ด้วยผู้ใช้ &lt;user&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>ไม่มีการกำหนดค่าบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>เพิ่มใหม่</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>ลบออก</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>บัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>เลือกข้อมูลที่ต้องการประสาน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>บังคับประสานข้อมูลเดี๋ยวนี้</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>ประสานข้อมูลอีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>ลบโฟลเดอร์ที่ประสานข้อมูลออก</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
- <translation type="unfinished"/>
+ <translation>เปิดใช้งานการรองรับไฟล์เสมือน %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
- <translation type="unfinished"/>
+ <translation>(ตัวอย่างทางเทคนิค)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(ทดลอง)</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>สร้างโฟลเดอร์ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;ไม่สามารถสร้างโฟลเดอร์ในเครื่อง &lt;i&gt;%1&lt;/i&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>ยืนยันการลบโฟลเดอร์ที่ประสานข้อมูลออก</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>ลบโฟลเดอร์ที่ประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation>ปิดใช้งานการสนับสนุนไฟล์เสมือน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -292,168 +292,168 @@ This action will abort any currently running synchronization.</source>
การดำเนินการนี้จะยกเลิกการประสานข้อมูลที่กำลังทำงานอยู่</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation>ปิดใช้งานการสนับสนุน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>กำลังประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>กำลังดำเนินการประสานข้อมูลอยู่ &lt;br/&gt;คุณต้องการสิ้นสุดการทำงาน?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 กำลังถูกใช้งาน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 เช่น &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>เชื่อมต่อกับ %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>เซิร์ฟเวอร์ %1 ไม่สามารถใช้ได้ชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>เซิร์ฟเวอร์ %1 กำลังอยู่ในโหมดการบำรุงรักษา</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>ลงชื่อออกจาก %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>กำลังได้รับอนุญาตจากเบราเซอร์ &lt;a href=&apos;%1&apos;&gt;คลิกที่นี่&lt;/a&gt; เพื่อเปิดเบราเซอร์อีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>กำลังเชื่อมต่อไปยัง %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>ไม่มีการเชื่อมต่อไปยัง %1 ที่ %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>เข้าสู่ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>บางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะขนาดของมันใหญ่เกินไป:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>มีบางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะเป็นพื้นที่จัดเก็บข้อมูลภายนอก</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>มีบางโฟลเดอร์จะไม่ถูกประสานข้อมูลเพราะเป็นพื้นที่จัดเก็บข้อมูลภายนอกหรือมีขนาดที่ใหญ่เกินไป</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>ยืนยันการลบบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;คุณต้องการลบการเชื่อมต่อกับบัญชี&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;หมายเหตุ:&lt;/b&gt; นี้จะ &lt;b&gt;ไม่&lt;/b&gt; ลบไฟล์ใดๆ&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>ลบการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>เปิดโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation>เปิดโฟลเดอร์ในเครื่อง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation>เปิดโฟลเดอร์ในเบราว์เซอร์</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>ประสานข้อมูลอีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>หยุดประสานข้อมูลชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation>ความพร้อมใช้งาน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation>ปิดใช้งานการสนับสนุนไฟล์เสมือน...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;คุณต้องการหยุดการประสานข้อมูลโฟลเดอร์&lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;หมายเหตุ:&lt;/b&gt; นี้จะ &lt;b&gt;ไม่&lt;/b&gt; ลบไฟล์ใดๆ&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>มีการใช้งาน %1 (%3%) จาก %2 บางโฟลเดอร์รวมทั้งเครือข่ายที่ติดตั้งหรือโฟลเดอร์ที่แชร์อาจมีข้อจำกัดที่แตกต่างกัน</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>มีการใช้งาน %1 จาก %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>ขณะนี้ไม่มีพื้นที่จัดเก็บข้อมูลที่ใช้งานได้</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>เซิร์ฟไม่สนับสนุนเวอร์เวอร์ชัน %1 นี่เป็นความเสี่ยงของคุณเอง</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>ไม่มีการเชื่อมต่อ %1 ที่ถูกกำหนดค่า</translation>
</message>
@@ -604,24 +604,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br /&gt;บัญชี %1 ไม่มีกิจกรรมที่เปิดใช้งาน</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>คุณได้รับ %n การแจ้งเตือนใหม่จาก %2</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>คุณได้รับ %n การแจ้งเตือนใหม่จาก %1 และ %2</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>คุณได้รับการแจ้งเตือนใหม่จาก %1, %2 และผู้ใช้อื่นๆ</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 การแจ้งเตือน - จำเป็นต้องดำเนินการ</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -777,8 +777,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>ข้อผิดพลาดเซิร์ฟเวอร์: การตอบกลับ PROPFIND ไม่ใช่รูปแบบ XML!</translation>
</message>
@@ -786,27 +786,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation>เกิดข้อผิดพลาดขณะเปิดไดเรกทอรี %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation>การเข้าถึงถูกปฏิเสธไม่สามารถเข้าถึงไดเรกทอรีบนไคลเอนต์</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation>ไม่พบไดเรกทอรี: %1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>การเข้ารหัสชื่อไฟล์ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation>เกิดข้อผิดพลาดขณะอ่านไดเรกทอรี %1</translation>
</message>
@@ -999,7 +999,7 @@ If this was an accident and you decide to keep your files, they will be re-synce
<message>
<location filename="../src/gui/folderman.cpp" line="354"/>
<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>
+ <translation>บนบันทึกการประสานข้อมูลเก่า &apos;%1&apos; แต่ไม่สามารถลบออกได้ กรุณาตรวจสอบให้แน่ใจว่าไม่มีแอปฯ หรือการทำงานใดๆที่ใช้มันอยู่</translation>
</message>
<message>
<location filename="../src/gui/folderman.cpp" line="1138"/>
@@ -1365,17 +1365,17 @@ If this was an accident and you decide to keep your files, they will be re-synce
<message>
<location filename="../src/gui/folderwizard.cpp" line="486"/>
<source>Use virtual files instead of downloading content immediately %1</source>
- <translation type="unfinished"/>
+ <translation>ใช้ไฟล์เสมือนแทนการดาวน์โหลดเนื้อหาแบบทันที</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="487"/>
<source>(tech preview)</source>
- <translation type="unfinished"/>
+ <translation>(ตัวอย่างทางเทคนิค)</translation>
</message>
<message>
<location filename="../src/gui/folderwizard.cpp" line="487"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(ทดลอง)</translation>
</message>
</context>
<context>
@@ -1581,7 +1581,7 @@ Note that this selects only what pool upgrades are taken from, and that there ar
<message>
<location filename="../src/gui/creds/httpcredentialsgui.cpp" line="167"/>
<source>&lt;a href=&quot;%1&quot;&gt;Click here&lt;/a&gt; to request an app password from the web interface.</source>
- <translation>&lt;a href=&quot;%1&quot;&gt;คลิกที่นี่&lt;/a&gt; เพื่อขอรหัสผ่านแอพฯ จากเว็บอินเตอร์เฟส</translation>
+ <translation>&lt;a href=&quot;%1&quot;&gt;คลิกที่นี่&lt;/a&gt; เพื่อขอรหัสผ่านแอปฯ จากเว็บอินเตอร์เฟส</translation>
</message>
</context>
<context>
@@ -2057,7 +2057,7 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="150"/>
<source>%1 available. Restart application to start the update.</source>
- <translation>%1 พร้อมใช้งานแล้ว รีสตาร์ทแอพพลิเคชันเพื่อเริ่มการอัปเดต</translation>
+ <translation>%1 พร้อมใช้งานแล้ว รีสตาร์ทแอปพลิเคชันเพื่อเริ่มการอัปเดต</translation>
</message>
<message>
<location filename="../src/gui/updater/ocupdater.cpp" line="156"/>
@@ -2105,17 +2105,17 @@ for additional privileges during the process.</source>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="82"/>
<source>Use &amp;virtual files instead of downloading content immediately %1</source>
- <translation type="unfinished"/>
+ <translation>ใช้ไฟล์ &amp;virtual แทนที่จะดาวน์โหลดเนื้อหาแบบทันที %1</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
<source>(tech preview)</source>
- <translation type="unfinished"/>
+ <translation>(ตัวอย่างทางเทคนิค)</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="83"/>
<source>(experimental)</source>
- <translation type="unfinished"/>
+ <translation>(ทดลอง)</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="176"/>
@@ -2243,12 +2243,12 @@ It is not advisable to use it.</source>
<translation>และถัดไป &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>URL ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>ไม่สามารถโหลดใบรับรอง รหัสผ่านไม่ถูกต้อง?</translation>
</message>
@@ -2261,144 +2261,139 @@ It is not advisable to use it.</source>
<translation>&lt;font color=&quot;green&quot;&gt;เชื่อมต่อกับ %1: %2 รุ่น %3 (%4) เสร็จเรียบร้อยแล้ว&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>ล้มเหลวในการเชื่อมต่อไปยัง %1 ที่ %2:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>หมดเวลาขณะที่พยายามเชื่อมต่อไปยัง %1 ที่ %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>กำลังพยายามเชื่อมต่อไปที่ %1 ที่ %2...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>คำขอการรับรองความถูกต้องไปยังเซิร์ฟเวอร์ที่ถูกเปลี่ยนเส้นทางไปยัง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>มีการตอบสนองที่ไม่ถูกต้องที่จะร้องขอการรับรองความถูกต้องของ WebDAV</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>การเข้าถึงถูกระงับโดยเซิร์ฟเวอร์ เพื่อตรวจสอบว่าคุณมีการเข้าถึงที่เหมาะสม &lt;a href=&quot;%1&quot;&gt;คลิกที่นี่&lt;/a&gt; เพื่อรเข้าถึงบริการกับเบราว์เซอร์ของคุณ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>URL ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>เซิร์ฟเวอร์รายงานข้อผิดพลาดต่อไปนี้:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>ประสานข้อมูลโฟลเดอร์ในเครื่อง %1 มีอยู่แล้ว กรุณาตั้งค่าเพื่อถ่ายข้อมูล &lt;br/&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>สร้างประสานข้อมูลโฟลเดอร์ในเครื่อง %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>ตกลง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>ไม่สามารถสร้างผสานข้อมูลโฟลเดอร์ในเครื่อง %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>ไม่มีโฟลเดอร์รีโมทที่ระบุ!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>ข้อผิดพลาด: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>กำลังสร้างโฟลเดอร์ใหม่บน ownCloud: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>โฟลเดอร์รีโมท %1 ถูกสร้างเรียบร้อยแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>โฟลเดอร์รีโมทมี %1 อยู่แล้ว กำลังเชื่อมต่อเพื่อถ่ายโอนข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>การสร้างโฟลเดอร์ดังกล่าวส่งผลให้เกิดรหัสข้อผิดพลาด HTTP error code %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>สร้างโฟลเดอร์ระยะไกลล้มเหลวเนื่องจากมีข้อมูลผิดพลาด!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;การสร้างโฟลเดอร์รีโมทล้มเหลว ซึ่งอาจมีสาเหตุมาจากการกรอกข้อมูลส่วนตัวเพื่อเข้าใช้งานไม่ถูกต้อง.&lt;/font&gt;&lt;br/&gt;กรุณาย้อนกลับไปแล้วตรวจสอบข้อมูลส่วนตัวของคุณอีกครั้ง.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>การสร้างโฟลเดอร์ระยะไกล %1 ล้มเหลวเนื่องข้อผิดพลาด &lt;tt&gt;%2&lt;/tt&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>การเชื่อมต่อเผื่อประสานข้อมูลจาก %1 ไปที่ไดเร็กทอรี่ระยะไกล %2 ได้ถูกติดตั้งแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>เชื่อมต่อไปที่ %1! สำเร็จ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>การเชื่อมต่อกับ %1 ไม่สามารถดำเนินการได้ กรุณาตรวจสอบอีกครั้ง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>เปลี่ยนชื่อโฟลเดอร์ล้มเหลว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>ไม่สามารถลบและสำรองข้อมูลโฟลเดอร์เพราะโฟลเดอร์หรือไฟล์ในนั้นจะเปิดในโปรแกรมอื่นอยู่ กรุณาปิดโฟลเดอร์หรือไฟล์และกดลองใหม่อีกครั้งหรือยกเลิกการติดตั้ง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;ประสานข้อมูลโฟลเดอร์ในเครื่อง %1 ได้ถูกสร้างขึ้นเรียบร้อยแล้ว!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2413,24 +2408,24 @@ It is not advisable to use it.</source>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="243"/>
<source>Enable technical preview feature?</source>
- <translation type="unfinished"/>
+ <translation>เปิดใช้งานคุณลักษณะตัวอย่างทางเทคนิค?</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="244"/>
<source>When the &quot;virtual files&quot; mode is enabled no files will be downloaded initially. Instead a virtual file will be created for each file that exists on the server. When a file is opened its contents will be downloaded automatically. Alternatively, files can be downloaded manually by using their context menu.
The virtual files mode is mutually exclusive with selective sync. Currently unselected folders will be translated to online-only folders and your selective sync settings will be reset.</source>
- <translation type="unfinished"/>
+ <translation>เมื่อเปิดใช้งานโหมด &quot;ไฟล์เสมือน&quot; จะไม่มีการดาวน์โหลดไฟล์ใดๆ ในช่วงแรกแต่จะสร้างไฟล์เสมือนสำหรับแต่ละไฟล์ที่มีอยู่บนเซิร์ฟเวอร์แทน เมื่อไฟล์ถูกเปิดในเครื่องเนื้อหาจะถูกดาวน์โหลดโดยอัตโนมัติ หรือสามารถดาวน์โหลดไฟล์ด้วยตนเองได้โดยใช้เมนูบริบท</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="252"/>
<source>Enable virtual files</source>
- <translation type="unfinished"/>
+ <translation>เปิดใช้งานไฟล์เสมือน</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="253"/>
<source>Continue to use selective sync</source>
- <translation type="unfinished"/>
+ <translation>ใช้การประสานข้อมูลที่เลือกต่อไป</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="258"/>
@@ -2440,7 +2435,7 @@ The virtual files mode is mutually exclusive with selective sync. Currently unse
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="272"/>
<source>Enable experimental placeholder mode</source>
- <translation type="unfinished"/>
+ <translation>เปิดใช้งานโหมด placeholder แบบทดลอง</translation>
</message>
<message>
<location filename="../src/gui/wizard/owncloudwizard.cpp" line="259"/>
@@ -2492,137 +2487,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>ลิงก์สัญลักษณ์จะไม่ได้รับการสนับสนุนในการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>ไฟล์อยู่ในรายการที่ละเว้น</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>ชื่อไฟล์ที่ลงท้ายด้วยระยะเวลา ยังไม่ได้รับการสนับสนุนบนระบบไฟล์นี้</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>ชื่อไฟล์ที่มีตัวอักษร &apos;%1&apos; ยังไม่ได้รับการสนับสนุนบนระบบไฟล์นี้</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>มีชื่อแฟ้มอย่างน้อยหนึ่งตัวอักษรที่ไม่ถูกต้อง</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>ชื่อไฟล์นี้เป็นชื่อที่ถูกสงวนไว้</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>ชื่อไฟล์มีช่องว่างต่อท้าย</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>ชื่อไฟล์ยาวเกินไป</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>ไฟล์/โฟลเดอร์ ที่ซ่อนอยู่จะถูกละเว้น</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>สถิติความล้มเหลว</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>เกิดปัญหาความขัดแย้ง: สำเนาที่อยู่ในเครื่องถูกเปลี่ยนชื่อและไม่ได้ถูกอัปโหลด เลยไม่ตรงกับข้อมูลที่เคยอัปโหลดไว้ในเซิฟเวอร์</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>ชื่อไฟล์ไม่สามารถเข้ารหัสในระบบไฟล์ของคุณได้</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation>ชื่อไฟล์นี้เป็นชื่อต้องห้าม</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation>ไฟล์มีส่วนขยายที่สงวนไว้สำหรับไฟล์เสมือน</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation>ขนาด</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation>สิทธิ์</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation>etag</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation>รหัสไฟล์</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation>เซิร์ฟเวอร์รายงานว่าไม่มี %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
- <translation type="unfinished"/>
+ <translation>ย้ายไปยังเป้าหมายที่ไม่ถูกต้อง กำลังดำเนินการกู้คืน</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>ไม่อนุญาตให้ลบเพราะกำลังฟื้นฟู</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>ถูกละเว้นเพราะ &quot;ข้อมูลที่เลือกประสาน&quot; ติดบัญชีดำ</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>ไม่อนุญาตเพราะคุณไม่มีสิทธิ์ที่จะเพิ่มโฟลเดอร์ย่อยของโฟลเดอร์นั้น</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>ไม่ได้รับอนุญาต เพราะคุณไม่มีสิทธิ์ที่จะเพิ่มไฟล์ในโฟลเดอร์นั้น</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>ไม่อนุญาตให้อัปโหลดไฟล์นี้เพราะมันจะอ่านได้เพียงอย่างเดียวบนเซิร์ฟเวอร์ กำลังกู้คืน</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation>เกิดข้อผิดพลาดขณะอ่านฐานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation>เซิร์ฟเวอร์ตอบกลับพร้อมข้อผิดพลาดขณะอ่านไดเรกทอรีแล้ว &apos;%1&apos; : %2</translation>
</message>
@@ -2768,7 +2763,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>รหัส HTTP ผิดพลาด โดยเซิร์ฟเวอร์คาดว่าจะได้รับรหัส 201 แต่กลับได้รับ &quot;%1 %2&quot;</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>ข้อผิดพลาดในการเขียน metadata ไปยังฐานข้อมูล</translation>
</message>
@@ -2940,17 +2935,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ขนาด</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>โปรโตคอลการประสานข้อมูลในเครื่อง</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>คัดลอก</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>คัดลอกรายชื่อกิจกรรมไปยังคลิปบอร์ด</translation>
</message>
@@ -3046,51 +3041,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>ตั้งค่า</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
- <source>Activity</source>
- <translation>กิจกรรม</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
- <source>General</source>
- <translation>ทั่วไป</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
- <source>Network</source>
- <translation>เครือข่าย</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>บัญชี</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>กิจกรรม</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>ทั่วไป</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>เครือข่าย</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>บัญชี</translation>
</message>
@@ -3434,48 +3400,48 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>แชร์กับ %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation>แชร์เมนูบริบท</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation>แชร์เมนูบริบท %1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation>ยืนยันการลบ</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation>คุณต้องการลบไดเรกทอรี &lt;i&gt;%1&lt;/i&gt; และเนื้อหาทั้งหมดอย่างถาวร?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation>คุณต้องการลบไฟล์ &lt;i&gt;%1&lt;/i&gt; แบบถาวร?</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation>เลือกตำแหน่งใหม่...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>ข้อผิดพลาด</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
@@ -3484,85 +3450,85 @@ This is a new, experimental mode. If you decide to use it, please report any iss
%1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>ฉันแชร์บางอย่างกับคุณ</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>แชร์...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>คัดลอกลิงก์ส่วนตัวไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>ส่งลิงก์ส่วนตัวทางอีเมล...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>การแชร์ไฟล์นี้ต่อไม่ได้รับอนุญาต</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation>ไม่อนุญาตให้แชร์โฟลเดอร์นี้ต่อ</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>คัดลอกลิงก์สาธารณะไปยังคลิปบอร์ด</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>เปิดในเบราว์เซอร์</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation>แสดงเวอร์ชันของไฟล์ในเบราว์เซอร์</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation>เปลี่ยนชื่อ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation>ปลี่ยนชื่อและอัปโหลด...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation>ย้ายและเปลี่ยนชื่อ...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation>ย้าย เปลี่ยนชื่อและอัปโหลด...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation>ลบการเปลี่ยนแปลงในเครื่อง</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation>ย้ายและอัปโหลด...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>ลบ</translation>
</message>
@@ -3778,58 +3744,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 (ข้ามไปเนื่องจากข้อผิดพลาดก่อนหน้านี้ กำลังลองอีกครั้งใน %2)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>มีเพียง %1 ที่พร้อมใช้งาน คุณจำเป็นต้องมีไม่น้อยกว่า %2 เพื่อเริ่มใช้งาน</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>ไม่สามารถเปิดหรือสร้างฐานข้อมูลการประสานข้อมูลในเครื่อง ตรวจสอบว่าคุณมีสิทธิ์การเขียนในโฟลเดอร์ประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation>พื้นที่จัดเก็บเหลือน้อย: การดาวน์โหลดจะช่วยลดพื้นที่ว่างด้านล่าง %1 ที่ถูกข้ามไป</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>มีพื้นที่ว่างไม่เพียงพอบนเซิร์ฟเวอร์สำหรับการอัปโหลดบางรายการ</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>ข้อขัดแย้งที่ยังไม่ได้แก้ไข</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation>ไม่สามารถอัปเดตข้อมูล metadata ของไฟล์เสมือน: %1</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation>กำลังใช้ไฟล์เสมือนที่มีคำต่อท้าย แต่ไม่ได้ตั้งคำต่อท้าย</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>ไม่สามารถอ่านบัญชีดำจากฐานข้อมูลในเครื่อง</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>ไม่สามารถอ่านจากบันทึกการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>ไม่สามารถเปิดการผสานข้อมูลเจอร์นัล</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>ยกเลิกแล้ว</translation>
</message>
@@ -3871,17 +3837,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>การตรวจสอบส่วนหัวผิดรูปแบบ</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>จากการตรวจสอบส่วนหัวมีประเภทที่ไม่รู้จัก &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>ไฟล์ที่ดาวน์โหลดมาไม่ตรงกับการตรวจสอบที่กลับคืนมา</translation>
</message>
@@ -3925,243 +3891,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>กรุณาเข้าสู่ระบบ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>โฟลเดอร์ %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>ไม่มีการกำหนดค่าการประสานข้อมูลโฟลเดอร์</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>เปิดในเบราว์เซอร์</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>เข้าสู่ระบบ...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>การเปลี่ยนแปลงล่าสุด</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>โฟลเดอร์ที่มีการจัดการแล้ว:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>เปิดโฟลเดอร์ &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>เปิด %1 ในเบราว์เซอร์</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>เซิร์ฟเวอร์ในบัญชี %1 ไม่รองรับการทำงานกับ %2 ซึ่งอาจเป็นอันตราย ดำเนินการตามความเสี่ยงของคุณเอง</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>สถานะที่ไม่รู้จัก</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>ตั้งค่า...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>รายละเอียด...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>ช่วยเหลือ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>ออก %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>ถูกตัดการเชื่อมต่อจาก %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>ไม่สนับสนุนรุ่นของ Server</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>ยกเลิกการเชื่อมต่อ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>ยกเลิกการเชื่อมต่อจากบางบัญชี</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>ยกเลิกการเชื่อมต่อจากบัญชี:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>บัญชี %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>ออกจากระบบ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>บัญชีประสานข้อมูลถูกปิดใช้งาน</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>หยุดการประสานข้อมูลแล้ว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>มีข้อขัดแย้งที่ยังไม่ได้รับการแก้ไข</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>เกิดข้อผิดพลาดขณะทำการประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>ไม่ได้กำหนดค่าโฟลเดอร์ที่จะประสานข้อมูล</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>ทำโฟลเดอร์ทั้งหมดต่อ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>หยุดโฟลเดอร์ทั้งหมดชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>ประสานข้อมูลทั้งหมดต่อ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>ประสานข้อมูลต่อ</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>หยุดการประสานข้อมูลทั้งหมดชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>หยุดการประสานข้อมูลชั่วคราว</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>ออกจากระบบของบัญชีทั้งหมด</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>เข้าสู่ระบบของบัญชีทั้งหมด...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>สร้างบัญชีใหม่...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>เกี่ยวกับ %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>ไม่มีรายการที่ถูกประสานข้อมูลเมื่อเร็วๆ นี้</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>กำลังตรวจหาการเปลี่ยนแปลงในรีโมต &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>กำลังตรวจหาการเปลี่ยนแปลงในเครื่อง &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>กำลังประสานข้อมูล %1 จาก %2 (เหลือ %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>กำลังประสานข้อมูล %1 จากทั้งหมด %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>กำลังประสานข้อมูล %1 (เหลือ %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>กำลังประสานข้อมูล %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>ถึงวันที่</translation>
</message>
@@ -4463,7 +4429,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/gui/main.cpp" line="39"/>
<source>%1 requires on a working system tray. If you are running XFCE, please follow &lt;a href=&quot;http://docs.xfce.org/xfce/xfce4-panel/systray&quot;&gt;these instructions&lt;/a&gt;. Otherwise, please install a system tray application such as &apos;trayer&apos; and try again.</source>
- <translation>%1 จำเป็นต้องทำงานบนถาดระบบ ถ้าคุณใช้ XFCE โปรดปฏิบัติตาม &lt;a href=&quot;http://docs.xfce.org/xfce/xfce4-panel/systray&quot;&gt;คำแนะนำเหล่านี้&lt;/a&gt; อย่างไรก็ตาม กรุณาติดตั้งแอพฯถาดระบบเช่น &apos;trayer&apos; และลองอีกครั้ง</translation>
+ <translation>%1 จำเป็นต้องทำงานบนถาดระบบ ถ้าคุณใช้ XFCE โปรดปฏิบัติตาม &lt;a href=&quot;http://docs.xfce.org/xfce/xfce4-panel/systray&quot;&gt;คำแนะนำเหล่านี้&lt;/a&gt; อย่างไรก็ตาม กรุณาติดตั้งแอปฯถาดระบบเช่น &apos;trayer&apos; และลองอีกครั้ง</translation>
</message>
</context>
<context>
@@ -4504,7 +4470,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="45"/>
<source>Deleted</source>
- <translation>ลบแล้ว</translation>
+ <translation>ลบเมื่อ</translation>
</message>
<message>
<location filename="../src/libsync/progressdispatcher.cpp" line="48"/>
diff --git a/translations/client_tr.ts b/translations/client_tr.ts
index 341dfc813..6f3867deb 100644
--- a/translations/client_tr.ts
+++ b/translations/client_tr.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>İptal</translation>
</message>
@@ -199,87 +199,87 @@
<translation>&lt;server&gt; ile &lt;user&gt; olarak bağlantı kuruldu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>Hiçbir hesap yapılandırılmamış.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>Yeni ekle</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>Kaldır</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>Hesap</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>Ne eşitleneceğini seçin</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>Şimdi eşitlemeye zorla</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>Eşitlemeyi yeniden başlat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>Klasör eşitleme bağlantısını sil</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>Klasör oluşturma başarısız oldu</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;&lt;i&gt;%1&lt;/i&gt; yerel klasörü oluşturulamadı.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>Klasör Eşitleme Bağlantısının Silinmesini Onaylayın</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>Klasör Eşitleme Bağlantısını Sil</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -288,168 +288,168 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>Eşitleme Çalışıyor</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>Eşitleme işlemi devam ediyor.&lt;br/&gt;Durdurmak istiyor musunuz?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 kullanımda</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1 &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>%1 ile bağlı.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>%1 sunucusu geçici olarak ulaşılamaz durumda.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>Sunucu %1 bakım modunda.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>%1 oturumu sonlandırıldı.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>Yetkilendirme tarayıcıdan alınıyor. Tarayıcıyı yeniden açmak için &lt;a href=&apos;%1&apos;&gt;tıklayın.&lt;/a&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>Bağlanılıyor, %1...</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>%1 ile %2 bağlantısı yok.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>Giriş yap</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>Çok büyük oldukları için eşitlenmeyen klasörler var:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>Harici depolama diskinde oldukları için eşitlenmeyen klasörler var:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>Çok büyük oldukları için ya da harici depolama alanında oldukları için eşitlenmeyen klasörler var:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>Hesap Silinmesini Onaylayın</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;i&gt;%1&lt;/i&gt; hesabının bağlantısını kaldırmayı gerçekten istiyor musunuz?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Not:&lt;/b&gt; Bu işlem herhangi bir dosyayı &lt;b&gt;silmeyecektir&lt;/b&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>Bağlantıyı kaldır</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>Klasörü aç</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>Çıkış yap</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>Eşitlemeye devam et</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>Eşitlemeyi duraklat</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;i&gt;%1&lt;/i&gt; klasörünün eşitlemesini durdurmayı gerçekten istiyor musunuz?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Not:&lt;/b&gt; Bu işlem herhangi bir dosyayı &lt;b&gt;silmeyecektir&lt;/b&gt;.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) / %2 kullanımda. Ağdan bağlanmış veya paylaşılan dizinlerin farklı sınırları olabilir.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>%1 / %2 kullanımda</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>Şu anda depolama kullanım bilgisi mevcut değil.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>Sunucu versiyonu %1 desteklenmiyor! Sorumluluk size ait.</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>Hiç %1 bağlantısı yapılandırılmamış.</translation>
</message>
@@ -600,24 +600,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;%1 hesabının geçerli kılınmış etkinlikleri bulunmamakta.</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>%2 için %n yeni bildiriminiz var.</numerusform><numerusform>%2 için %n yeni bildiriminiz var.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>%2 ve %1 için %n yeni bildiriminiz var.</numerusform><numerusform>%2 ve %1 için %n yeni bildiriminiz var.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>%2, %1 ve diğer hesaplardan %n yeni bildiriminiz var.</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 Bildirim - Eylem Gerekiyor</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,8 +773,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation type="unfinished"/>
</message>
@@ -782,27 +782,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>Dosya adı kodlaması geçerli değil</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation type="unfinished"/>
</message>
@@ -2235,12 +2235,12 @@ Kullanmanız önerilmez.</translation>
<translation>&amp;İleri &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>Geçersiz URL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>Sertifika yüklenemedi. Şifreniz yanlış olabilir mi?</translation>
</message>
@@ -2253,144 +2253,139 @@ Kullanmanız önerilmez.</translation>
<translation>&lt;font color=&quot;green&quot;&gt;%1 bağlantısı başarılı: %2 sürüm %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>%2 üzerinde %1 adresine bağlanılamadı:&lt;br/&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>%2 üzerinde %1 bağlantısı yapılırken zaman aşımı.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>%2 üzerinde %1 bağlantısı deneniyor...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>Sunucuda giriş sırasında istek &apos;%1&apos; adresine yönlendirilmiş. Adres hatalı veya sunucu yanlış ayarlanmış.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>Yetkilendirilmiş webdav isteği geçersiz bir cevap alındı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>Erişim sunucu tarafından yasaklandı. Geçerli erişime sahip olup olmadığınızı doğrulamak için hizmete web tarayıcınızla erişmek üzere &lt;a href=&quot;%1&quot;&gt;buraya tıklayın&lt;/a&gt;.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>Geçersiz URL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>Sunucu şu hatayı bildirdi:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>Yerel eşitleme klasörü %1 zaten mevcut, eşitlemek için ayarlanıyor.&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>Yerel eşitleme klasörü %1 oluşturuluyor...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>tamam</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>başarısız.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>%1 yerel klasörü oluşturulamadı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>Uzak klasör belirtilmemiş!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>Hata: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>ownCloud üzerinde klasör oluşturuluyor: %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>%1 uzak klasörü başarıyla oluşturuldu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>Uzak klasör %1 zaten mevcut. Eşitlemek için bağlanılıyor.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>Klasör oluşturma %1 HTTP hata kodu ile sonuçlandı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>Uzak klasör oluşturması, geçersiz kimlik bilgileri nedeniyle başarısız!&lt;br/&gt;Lütfen geri gidin ve bilgileri denetleyin.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Uzak klasör oluşturma muhtemelen hatalı kimlik bilgilerinden dolayı başarısız oldu.&lt;/font&gt;&lt;br/&gt;Lütfen geri gidip kimlik bilgilerini doğrulayın.&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>Uzak klasör %1 oluşturma işlemi &lt;tt&gt;%2&lt;/tt&gt; hatası ile başarısız oldu.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>%1 kaynaklı %2 uzak dizinine bir eşitleme bağlantısı ayarlandı.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>%1 bağlantısı başarılı!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>%1 bağlantısı kurulamadı. Lütfen tekrar denetleyin.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>Klasör adlandırma başarısız</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>Klasör veya içerisindeki bir dosya farklı bir program içerisinde açık olduğundan, kaldırma ve yedekleme işlemi yapılamıyor. Lütfen klasör veya dosyayı kapatıp yeniden deneyin veya kurulumu iptal edin.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Yerel eşitleme klasörü %1 başarıyla oluşturuldu!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2480,137 +2475,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>Sembolik bağlantılar eşitlemede desteklenmiyor.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>Dosya yoksayma listesinde.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>Dosya adı en az bir geçersiz karakter içeriyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>Dosya adı bu dosya sisteminde ayrılmış bir addır.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>Dosya adı çok uzun.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>Dosya/Klasör gizli olduğu için yoksayıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>Durum alma başarısız.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>Kaldırmaya izin verilmedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>&quot;Eşitlenecekleri seçin&quot; kara listesinde olduğundan yoksayıldı.</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>Bu dizine alt dizin ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>Bu klasöre dosya ekleme yetkiniz olmadığından izin verilmedi</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>Sunucuda salt okunur olduğundan, bu dosya yüklenemedi, geri alınıyor</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation type="unfinished"/>
</message>
@@ -2756,7 +2751,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Sunucudan yanlış HTTP kodu döndü. 201 bekleniyordu, ancak &quot;%1 %2&quot; geldi.</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>Veritabanına üstveri yazma hatası</translation>
</message>
@@ -2928,17 +2923,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Boyut</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>Yerel eşitleme protokolü</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>Kopyala</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>Etkinlik listesini panoya kopyala.</translation>
</message>
@@ -3034,51 +3029,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>Ayarlar</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>Etkinlik</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>Genel</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>Ağ</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>Hesap</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>Etkinlik</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>Genel</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>Ağ</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>Hesap</translation>
</message>
@@ -3422,133 +3388,133 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>%1 ile paylaş</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>Hata</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>Paylaş...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>Tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>Sil</translation>
</message>
@@ -3766,58 +3732,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>Sadece %1 mevcut, Çalıştırmak için en az %2 gerekmektedir</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>Yerel veritabanından kara liste okunamadı</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>Eşitleme günlüğünden okunamadı.</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>Eşitleme günlüğü açılamıyor</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>İptal Edildi</translation>
</message>
@@ -3859,17 +3825,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>Sağlama toplam başlığı bozulmuş.</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>Sağlama başlığı bilinmeyen &apos;%1&apos; sağlama tipi içeriyor</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>İndirilen dosya sağlama toplamı ile eşleşmiyor, devam edilecek.</translation>
</message>
@@ -3913,243 +3879,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>Lütfen oturum açın</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>Klasör %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>Yapılandırılmış eşitleme klasörü yok.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>Tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>Giriş yap...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>Çıkış yap</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>Son Değişiklikler</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>Yönetilen Klasörler:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>&apos;%1&apos; klasörünü aç</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>%1&apos;ı tarayıcıda aç</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>Bilinmeyen durum</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>Ayarlar...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>Ayrıntılar...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>Yardım</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>%1&apos;tan çık</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>%1 ile bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>Desteklenmeyen Sunucu Sürümü</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>Bağlantı kesildi</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>Bu hesapların bağlantıları kesildi:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>Hesap %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>Oturum sonlandırıldı</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>Hesap eşitlemesi devre dışı bırakıldı.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>Tüm klasörleri devam ettir</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>Tüm klasörleri durdur</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>Tüm eşitlemeleri devam ettir</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>Eşitlemeyi devam ettir</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>Tüm eşitlemeleri durdur</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>Eşitlemeyi durdur</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>Tüm hesaplardan çıkış yap</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>Tüm hesaplara giriş yap...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>Yeni hesap...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>%1 hakkında</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>Yakın zamanda eşitlenen öge yok</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>Uzaktaki &apos;%1&apos; için değişiklikler kontrol ediliyor.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>Yereldeki &apos;%1&apos; için değişiklikler kontrol ediliyor.</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>Eşitlenen %1/%2 (%3 kaldı)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>%2 nin %1 i eşitleniyor</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>Eşitlenen %1 (%2 kaldı)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>%1 eşitleniyor</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>Güncel</translation>
</message>
diff --git a/translations/client_zh_CN.ts b/translations/client_zh_CN.ts
index 4d971bbc9..2ff66730f 100644
--- a/translations/client_zh_CN.ts
+++ b/translations/client_zh_CN.ts
@@ -187,9 +187,9 @@
</message>
<message>
<location filename="../src/gui/accountsettings.ui" line="247"/>
- <location filename="../src/gui/accountsettings.cpp" line="511"/>
- <location filename="../src/gui/accountsettings.cpp" line="618"/>
- <location filename="../src/gui/accountsettings.cpp" line="1057"/>
+ <location filename="../src/gui/accountsettings.cpp" line="497"/>
+ <location filename="../src/gui/accountsettings.cpp" line="604"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1043"/>
<source>Cancel</source>
<translation>取消</translation>
</message>
@@ -199,87 +199,87 @@
<translation>&lt;user&gt; 已经连接到 &lt;server&gt; </translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="184"/>
+ <location filename="../src/gui/accountsettings.cpp" line="180"/>
<source>No account configured.</source>
<translation>没有配置的帐号。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="193"/>
<source>Add new</source>
<translation>添加</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="205"/>
+ <location filename="../src/gui/accountsettings.cpp" line="201"/>
<source>Remove</source>
<translation>移除</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="209"/>
+ <location filename="../src/gui/accountsettings.cpp" line="205"/>
<source>Account</source>
<translation>账户</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="321"/>
+ <location filename="../src/gui/accountsettings.cpp" line="307"/>
<source>Choose what to sync</source>
<translation>选择同步内容</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="327"/>
+ <location filename="../src/gui/accountsettings.cpp" line="313"/>
<source>Force sync now</source>
<translation>强制同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="329"/>
+ <location filename="../src/gui/accountsettings.cpp" line="315"/>
<source>Restart sync</source>
<translation>重新开始同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="338"/>
+ <location filename="../src/gui/accountsettings.cpp" line="324"/>
<source>Remove folder sync connection</source>
<translation>断开文件夹同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>Enable virtual file support %1...</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(tech preview)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="367"/>
+ <location filename="../src/gui/accountsettings.cpp" line="353"/>
<source>(experimental)</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="446"/>
+ <location filename="../src/gui/accountsettings.cpp" line="432"/>
<source>Folder creation failed</source>
<translation>文件夹创建失败</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="447"/>
+ <location filename="../src/gui/accountsettings.cpp" line="433"/>
<source>&lt;p&gt;Could not create local folder &lt;i&gt;%1&lt;/i&gt;.</source>
<translation>&lt;p&gt;无法创建文件夹 &lt;i&gt;%1&lt;/i&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="503"/>
+ <location filename="../src/gui/accountsettings.cpp" line="489"/>
<source>Confirm Folder Sync Connection Removal</source>
<translation>确定断开文件夹同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="510"/>
+ <location filename="../src/gui/accountsettings.cpp" line="496"/>
<source>Remove Folder Sync Connection</source>
<translation>断开文件夹同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="609"/>
+ <location filename="../src/gui/accountsettings.cpp" line="595"/>
<source>Disable virtual file support?</source>
<translation>是否取消虚拟文件?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="610"/>
+ <location filename="../src/gui/accountsettings.cpp" line="596"/>
<source>This action will disable virtual file support. As a consequence contents of folders that are currently marked as 'available online only' will be downloaded.
The only advantage of disabling virtual file support is that the selective sync feature will become available again.
@@ -288,168 +288,168 @@ This action will abort any currently running synchronization.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="617"/>
+ <location filename="../src/gui/accountsettings.cpp" line="603"/>
<source>Disable support</source>
<translation>取消支持</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="722"/>
+ <location filename="../src/gui/accountsettings.cpp" line="708"/>
<source>Sync Running</source>
<translation>正在同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="723"/>
+ <location filename="../src/gui/accountsettings.cpp" line="709"/>
<source>The syncing operation is running.&lt;br/&gt;Do you want to terminate it?</source>
<translation>正在执行同步。&lt;br /&gt;您确定要关闭它吗?</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="818"/>
+ <location filename="../src/gui/accountsettings.cpp" line="804"/>
<source>%1 in use</source>
<translation>%1 使用中</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="845"/>
+ <location filename="../src/gui/accountsettings.cpp" line="831"/>
<source>%1 as &lt;i&gt;%2&lt;/i&gt;</source>
<translation>%1, &lt;i&gt;%2&lt;/i&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="853"/>
+ <location filename="../src/gui/accountsettings.cpp" line="839"/>
<source>Connected to %1.</source>
<translation>连接到 %1。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="855"/>
+ <location filename="../src/gui/accountsettings.cpp" line="841"/>
<source>Server %1 is temporarily unavailable.</source>
<translation>远程服务器%1暂时不可用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="857"/>
+ <location filename="../src/gui/accountsettings.cpp" line="843"/>
<source>Server %1 is currently in maintenance mode.</source>
<translation>服务器%1处于维护模式。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="859"/>
+ <location filename="../src/gui/accountsettings.cpp" line="845"/>
<source>Signed out from %1.</source>
<translation>从 %1 退出</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="868"/>
+ <location filename="../src/gui/accountsettings.cpp" line="854"/>
<source>Obtaining authorization from the browser. &lt;a href=&apos;%1&apos;&gt;Click here&lt;/a&gt; to re-open the browser.</source>
<translation>从浏览器获取权限。&lt;a href=&apos;%1&apos;&gt;点击此按钮&lt;/a&gt;重启浏览器。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="872"/>
+ <location filename="../src/gui/accountsettings.cpp" line="858"/>
<source>Connecting to %1...</source>
<translation>正在连接到 %1</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="875"/>
+ <location filename="../src/gui/accountsettings.cpp" line="861"/>
<source>No connection to %1 at %2.</source>
<translation>没有到位于%2中的%1的连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="904"/>
+ <location filename="../src/gui/accountsettings.cpp" line="890"/>
<source>Log in</source>
<translation>登录</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1000"/>
+ <location filename="../src/gui/accountsettings.cpp" line="986"/>
<source>There are folders that were not synchronized because they are too big: </source>
<translation>以下目录由于太大而没有同步:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1002"/>
+ <location filename="../src/gui/accountsettings.cpp" line="988"/>
<source>There are folders that were not synchronized because they are external storages: </source>
<translation>以下目录由于是外部存储而没有同步:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1003"/>
+ <location filename="../src/gui/accountsettings.cpp" line="989"/>
<source>There are folders that were not synchronized because they are too big or external storages: </source>
<translation>以下目录由于太大或是外部存储而没有同步:</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1049"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1035"/>
<source>Confirm Account Removal</source>
<translation>确认删除账号</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1050"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1036"/>
<source>&lt;p&gt;Do you really want to remove the connection to the account &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;你确定要删除账号的连接? &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; 这 &lt;b&gt;不会&lt;/b&gt; 删除任何文件&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="1056"/>
+ <location filename="../src/gui/accountsettings.cpp" line="1042"/>
<source>Remove connection</source>
<translation>删除连接</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="317"/>
+ <location filename="../src/gui/accountsettings.cpp" line="303"/>
<source>Open folder</source>
<translation>打开文件夹</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="201"/>
- <location filename="../src/gui/accountsettings.cpp" line="906"/>
+ <location filename="../src/gui/accountsettings.cpp" line="197"/>
+ <location filename="../src/gui/accountsettings.cpp" line="892"/>
<source>Log out</source>
<translation>注销</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="276"/>
+ <location filename="../src/gui/accountsettings.cpp" line="262"/>
<source>Open local folder</source>
<translation>打开本地文件夹</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="284"/>
+ <location filename="../src/gui/accountsettings.cpp" line="270"/>
<source>Open folder in browser</source>
<translation>在浏览器中打开文件夹</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Resume sync</source>
<translation>恢复同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="335"/>
+ <location filename="../src/gui/accountsettings.cpp" line="321"/>
<source>Pause sync</source>
<translation>暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="342"/>
+ <location filename="../src/gui/accountsettings.cpp" line="328"/>
<source>Availability</source>
<translation>可用性</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="359"/>
+ <location filename="../src/gui/accountsettings.cpp" line="345"/>
<source>Disable virtual file support...</source>
<translation>关闭虚拟文件</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="504"/>
+ <location filename="../src/gui/accountsettings.cpp" line="490"/>
<source>&lt;p&gt;Do you really want to stop syncing the folder &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; This will &lt;b&gt;not&lt;/b&gt; delete any files.&lt;/p&gt;</source>
<translation>&lt;p&gt;你确定要停止文件夹同步? &lt;i&gt;%1&lt;/i&gt;?&lt;/p&gt;&lt;p&gt;&lt;b&gt;Note:&lt;/b&gt; 这 &lt;b&gt;不会&lt;/b&gt; 删除任何文件&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="805"/>
+ <location filename="../src/gui/accountsettings.cpp" line="791"/>
<source>%1 (%3%) of %2 in use. Some folders, including network mounted or shared folders, might have different limits.</source>
<translation>%1 (%3%) of %2 使用中。一些文件夹,例如网络挂载的和共享的文件夹,可能有不同的限制。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="806"/>
+ <location filename="../src/gui/accountsettings.cpp" line="792"/>
<source>%1 of %2 in use</source>
<translation>使用量 %1 / %2</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="815"/>
+ <location filename="../src/gui/accountsettings.cpp" line="801"/>
<source>Currently there is no storage usage information available.</source>
<translation>目前没有储存使用量信息可用。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="851"/>
+ <location filename="../src/gui/accountsettings.cpp" line="837"/>
<source>The server version %1 is unsupported! Proceed at your own risk.</source>
<translation>不支持服务器版本 %1!继续操作将自行承担风险。</translation>
</message>
<message>
- <location filename="../src/gui/accountsettings.cpp" line="881"/>
+ <location filename="../src/gui/accountsettings.cpp" line="867"/>
<source>No %1 connection configured.</source>
<translation>没有 %1 连接配置。</translation>
</message>
@@ -600,24 +600,24 @@ This action will abort any currently running synchronization.</source>
<translation>&lt;br/&gt;帐户%1没有同步活动。</translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="349"/>
- <source>You received %n new notification(s) from %2.</source>
- <translation><numerusform>你收到 %n 新的通知来自于 %2.</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="351"/>
+ <source>You received %n new request(s) from %1.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message numerus="yes">
- <location filename="../src/gui/activitywidget.cpp" line="356"/>
- <source>You received %n new notification(s) from %1 and %2.</source>
- <translation><numerusform>你收到 %n 新的通知来自 %1 和 %2。</numerusform></translation>
+ <location filename="../src/gui/activitywidget.cpp" line="357"/>
+ <source>You received %n new request(s) from %1 and %2.</source>
+ <translation type="unfinished"><numerusform></numerusform></translation>
</message>
<message>
- <location filename="../src/gui/activitywidget.cpp" line="358"/>
- <source>You received new notifications from %1, %2 and other accounts.</source>
- <translation>你收到新的通知 %1, %2 和其它账户。</translation>
+ <location filename="../src/gui/activitywidget.cpp" line="359"/>
+ <source>You received new request from %1, %2 and other accounts.</source>
+ <translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/activitywidget.cpp" line="362"/>
- <source>%1 Notifications - Action Required</source>
- <translation>%1 通知 - 需要采取行动</translation>
+ <source>Action required. Open the activity view to react.</source>
+ <translation type="unfinished"/>
</message>
</context>
<context>
@@ -773,8 +773,8 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="453"/>
- <location filename="../src/libsync/discoveryphase.cpp" line="475"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="467"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="489"/>
<source>Server error: PROPFIND reply is not XML formatted!</source>
<translation>服务器错误: PROPFIND 返回的不是XML格式!</translation>
</message>
@@ -782,27 +782,27 @@ This action will abort any currently running synchronization.</source>
<context>
<name>OCC::DiscoverySingleLocalDirectoryJob</name>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="235"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
<source>Error while opening directory %1</source>
<translation>打开目录 %1 时出现错误</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="237"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="239"/>
<source>Directory not accessible on client, permission denied</source>
<translation>无法在客户端上访问目录,没有权限</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="241"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="243"/>
<source>Directory not found: %1</source>
<translation>无法找到目录:%1</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="268"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="274"/>
<source>Filename encoding is not valid</source>
<translation>文件名编码无效</translation>
</message>
<message>
- <location filename="../src/libsync/discoveryphase.cpp" line="286"/>
+ <location filename="../src/libsync/discoveryphase.cpp" line="293"/>
<source>Error while reading directory %1</source>
<translation>读取目录 %1 时出错</translation>
</message>
@@ -2229,12 +2229,12 @@ It is not advisable to use it.</source>
<translation>下一步 (&amp;N) &gt;</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="203"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="204"/>
<source>Invalid URL</source>
<translation>无效URL</translation>
</message>
<message>
- <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="315"/>
+ <location filename="../src/gui/wizard/owncloudsetuppage.cpp" line="316"/>
<source>Could not load certificate. Maybe wrong password?</source>
<translation>不能加载认证.可能是密码错误?</translation>
</message>
@@ -2247,144 +2247,139 @@ It is not advisable to use it.</source>
<translation>&lt;font color=&quot;green&quot;&gt;成功连接到 %1:%2 版本 %3 (%4)&lt;/font&gt;&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="285"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
<source>Failed to connect to %1 at %2:&lt;br/&gt;%3</source>
<translation>连接到 %1 (%2)失败:&lt;br /&gt;%3</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="301"/>
<source>Timeout while trying to connect to %1 at %2.</source>
<translation>连接到 %1 (%2) 时超时。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="339"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="320"/>
<source>Trying to connect to %1 at %2...</source>
<translation>尝试连接位于 %2 的 %1...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="390"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="371"/>
<source>The authenticated request to the server was redirected to &apos;%1&apos;. The URL is bad, the server is misconfigured.</source>
<translation>被发送到服务器的认证请求被重定向到&apos;%1&apos;。此URL无效,服务器配置错误。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="412"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="393"/>
<source>There was an invalid response to an authenticated webdav request</source>
<translation>对于一个验证的 webdav 请求,有一个无效的响应</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="403"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="384"/>
<source>Access forbidden by server. To verify that you have proper access, &lt;a href=&quot;%1&quot;&gt;click here&lt;/a&gt; to access the service with your browser.</source>
<translation>服务器拒绝了访问。&lt;a href=&quot;%1&quot;&gt;点击这里打开浏览器&lt;/a&gt; 来确认您是否有权访问。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="283"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="281"/>
<source>Invalid URL</source>
<translation>无效URL</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="302"/>
- <source>The server reported the following error:</source>
- <translation>服务器报告了以下错误:</translation>
- </message>
- <message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="457"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="438"/>
<source>Local sync folder %1 already exists, setting it up for sync.&lt;br/&gt;&lt;br/&gt;</source>
<translation>本地同步文件夹 %1 已存在,将使用它来同步。&lt;br/&gt;&lt;br/&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="460"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="441"/>
<source>Creating local sync folder %1...</source>
<translation>创建本地同步目录%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="464"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="445"/>
<source>ok</source>
<translation>成功</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="466"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="447"/>
<source>failed.</source>
<translation>失败</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="468"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="449"/>
<source>Could not create local folder %1</source>
<translation>不能创建本地文件夹 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="475"/>
<source>No remote folder specified!</source>
<translation>未指定远程文件夹!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="500"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="481"/>
<source>Error: %1</source>
<translation>错误:%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="513"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="494"/>
<source>creating folder on ownCloud: %1</source>
<translation>在 ownCloud 创建文件夹:%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="529"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="510"/>
<source>Remote folder %1 created successfully.</source>
<translation>远程目录%1成功创建。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="531"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="512"/>
<source>The remote folder %1 already exists. Connecting it for syncing.</source>
<translation>远程文件夹 %1 已存在。连接它以供同步。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="533"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="535"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="514"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="516"/>
<source>The folder creation resulted in HTTP error code %1</source>
<translation>创建文件夹出现 HTTP 错误代码 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="537"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="518"/>
<source>The remote folder creation failed because the provided credentials are wrong!&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>远程文件夹创建失败,因为提供的凭证有误!&lt;br/&gt;请返回并检查您的凭证。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="541"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="522"/>
<source>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;Remote folder creation failed probably because the provided credentials are wrong.&lt;/font&gt;&lt;br/&gt;Please go back and check your credentials.&lt;/p&gt;</source>
<translation>&lt;p&gt;&lt;font color=&quot;red&quot;&gt;远程文件夹创建失败,可能是由于提供的用户名密码不正确。&lt;/font&gt;&lt;br/&gt;请返回并检查它们。&lt;/p&gt;</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="546"/>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="547"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="527"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="528"/>
<source>Remote folder %1 creation failed with error &lt;tt&gt;%2&lt;/tt&gt;.</source>
<translation>创建远程文件夹 %1 失败,错误为 &lt;tt&gt;%2&lt;/tt&gt;。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="564"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="545"/>
<source>A sync connection from %1 to remote directory %2 was set up.</source>
<translation>已经设置了一个 %1 到远程文件夹 %2 的同步连接</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="569"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="550"/>
<source>Successfully connected to %1!</source>
<translation>成功连接到了 %1!</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="576"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="557"/>
<source>Connection to %1 could not be established. Please check again.</source>
<translation>无法建立到 %1的链接,请稍后重试(这里“稍后”用对了,赞!)。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="590"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="571"/>
<source>Folder rename failed</source>
<translation>文件夹更名失败</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="591"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="572"/>
<source>Can&apos;t remove and back up the folder because the folder or a file in it is open in another program. Please close the folder or file and hit retry or cancel the setup.</source>
<translation>无法移除和备份文件夹,由于文件夹或文件正在被另一程序占用。请关闭程序后重试,或取消安装。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudsetupwizard.cpp" line="641"/>
+ <location filename="../src/gui/owncloudsetupwizard.cpp" line="622"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Local sync folder %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;本地同步目录 %1 已成功创建&lt;/b&gt;&lt;/font&gt;</translation>
</message>
@@ -2474,137 +2469,137 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ProcessDirectoryJob</name>
<message>
- <location filename="../src/libsync/discovery.cpp" line="215"/>
+ <location filename="../src/libsync/discovery.cpp" line="212"/>
<source>Symbolic links are not supported in syncing.</source>
<translation>符号链接不被同步支持。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="223"/>
+ <location filename="../src/libsync/discovery.cpp" line="220"/>
<source>File is listed on the ignore list.</source>
<translation>文件在忽略列表中。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="227"/>
+ <location filename="../src/libsync/discovery.cpp" line="224"/>
<source>File names ending with a period are not supported on this file system.</source>
<translation>文件名结尾不可以为“.”。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="237"/>
+ <location filename="../src/libsync/discovery.cpp" line="234"/>
<source>File names containing the character &apos;%1&apos; are not supported on this file system.</source>
<translation>此文件系统不支持包含字符 &apos;%1&apos; 的文件名。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="241"/>
+ <location filename="../src/libsync/discovery.cpp" line="238"/>
<source>File name contains at least one invalid character</source>
<translation>文件名中存在至少一个非法字符</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="243"/>
+ <location filename="../src/libsync/discovery.cpp" line="240"/>
<source>The file name is a reserved name on this file system.</source>
<translation>文件名为系统保留文件名。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="248"/>
+ <location filename="../src/libsync/discovery.cpp" line="245"/>
<source>Filename contains trailing spaces.</source>
<translation>文件名尾部含有空格</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="251"/>
+ <location filename="../src/libsync/discovery.cpp" line="248"/>
<source>Filename is too long.</source>
<translation>文件名过长。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="254"/>
+ <location filename="../src/libsync/discovery.cpp" line="251"/>
<source>File/Folder is ignored because it&apos;s hidden.</source>
<translation>已忽略隐藏的文件和文件夹。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="257"/>
+ <location filename="../src/libsync/discovery.cpp" line="254"/>
<source>Stat failed.</source>
<translation>状态失败。</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="260"/>
+ <location filename="../src/libsync/discovery.cpp" line="257"/>
<source>Conflict: Server version downloaded, local copy renamed and not uploaded.</source>
<translation>冲突:服务器版本已下载,本地版本被重命名但未上传</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="264"/>
+ <location filename="../src/libsync/discovery.cpp" line="261"/>
<source>The filename cannot be encoded on your file system.</source>
<translation>文件名在你的文件系统中不能编码</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="267"/>
+ <location filename="../src/libsync/discovery.cpp" line="264"/>
<source>The filename is blacklisted on the server.</source>
<translation>该文件名在服务器的黑名单上</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="320"/>
+ <location filename="../src/libsync/discovery.cpp" line="317"/>
<source>File has extension reserved for virtual files.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="381"/>
+ <location filename="../src/libsync/discovery.cpp" line="378"/>
<source>size</source>
<translation>大小</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="383"/>
+ <location filename="../src/libsync/discovery.cpp" line="380"/>
<source>permissions</source>
<translation>权限</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="385"/>
+ <location filename="../src/libsync/discovery.cpp" line="382"/>
<source>etag</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="387"/>
+ <location filename="../src/libsync/discovery.cpp" line="384"/>
<source>file id</source>
<translation>文件ID</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="391"/>
+ <location filename="../src/libsync/discovery.cpp" line="388"/>
<source>server reported no %1</source>
<translation>服务器回复没有 %1</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1219"/>
+ <location filename="../src/libsync/discovery.cpp" line="1218"/>
<source>Moved to invalid target, restoring</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1232"/>
+ <location filename="../src/libsync/discovery.cpp" line="1231"/>
<source>Not allowed to remove, restoring</source>
<translation>无法删除,正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1144"/>
+ <location filename="../src/libsync/discovery.cpp" line="1143"/>
<source>Ignored because of the &quot;choose what to sync&quot; blacklist</source>
<translation>已忽略(“选择同步内容”黑名单)</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1177"/>
+ <location filename="../src/libsync/discovery.cpp" line="1176"/>
<source>Not allowed because you don&apos;t have permission to add subfolders to that folder</source>
<translation>你没有权限增加子目录</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1182"/>
+ <location filename="../src/libsync/discovery.cpp" line="1181"/>
<source>Not allowed because you don&apos;t have permission to add files in that folder</source>
<translation>你没有权限增加文件</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1196"/>
+ <location filename="../src/libsync/discovery.cpp" line="1195"/>
<source>Not allowed to upload this file because it is read-only on the server, restoring</source>
<translation>无法上传文件,因为服务器端此文件为只读,正在回退</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1341"/>
+ <location filename="../src/libsync/discovery.cpp" line="1340"/>
<source>Error while reading the database</source>
<translation>读取数据库是出错</translation>
</message>
<message>
- <location filename="../src/libsync/discovery.cpp" line="1387"/>
+ <location filename="../src/libsync/discovery.cpp" line="1386"/>
<source>Server replied with an error while reading directory &apos;%1&apos; : %2</source>
<translation>服务器读取目录时出错,目录 &apos;%1&apos; : %2</translation>
</message>
@@ -2750,7 +2745,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>服务器返回的 HTTP 状态错误,应返回 201,但返回的是“%1 %2”。</translation>
</message>
<message>
- <location filename="../src/libsync/propagateremotemkdir.cpp" line="151"/>
+ <location filename="../src/libsync/propagateremotemkdir.cpp" line="152"/>
<source>Error writing metadata to the database</source>
<translation>向数据库写入元数据错误</translation>
</message>
@@ -2922,17 +2917,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>大小</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="217"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="211"/>
<source>Local sync protocol</source>
<translation>本地同步协议</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="219"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="213"/>
<source>Copy</source>
<translation>复制</translation>
</message>
<message>
- <location filename="../src/gui/protocolwidget.cpp" line="220"/>
+ <location filename="../src/gui/protocolwidget.cpp" line="214"/>
<source>Copy the activity list to the clipboard.</source>
<translation>复制动态列表到剪贴板。</translation>
</message>
@@ -3028,51 +3023,22 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>设置</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="92"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="88"/>
<source>Activity</source>
<translation>动态</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="101"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="97"/>
<source>General</source>
<translation>常规</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="108"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="104"/>
<source>Network</source>
<translation>网络</translation>
</message>
<message>
- <location filename="../src/gui/settingsdialog.cpp" line="219"/>
- <source>Account</source>
- <translation>账户</translation>
- </message>
-</context>
-<context>
- <name>OCC::SettingsDialogMac</name>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="94"/>
- <source>%1</source>
- <translation>%1</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="98"/>
- <source>Activity</source>
- <translation>动态</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="112"/>
- <source>General</source>
- <translation>常规</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="117"/>
- <source>Network</source>
- <translation>网络</translation>
- </message>
- <message>
- <location filename="../src/gui/settingsdialogmac.cpp" line="160"/>
- <location filename="../src/gui/settingsdialogmac.cpp" line="228"/>
+ <location filename="../src/gui/settingsdialog.cpp" line="215"/>
<source>Account</source>
<translation>账户</translation>
</message>
@@ -3416,48 +3382,48 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::SocketApi</name>
<message>
- <location filename="../src/gui/socketapi.cpp" line="487"/>
+ <location filename="../src/gui/socketapi.cpp" line="486"/>
<source>Share with %1</source>
<comment>parameter is ownCloud</comment>
<translation>使用 %1 共享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="523"/>
+ <location filename="../src/gui/socketapi.cpp" line="522"/>
<source>Context menu share</source>
<translation>上下文菜单分享</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="528"/>
+ <location filename="../src/gui/socketapi.cpp" line="527"/>
<source>Context menu share %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="717"/>
+ <location filename="../src/gui/socketapi.cpp" line="716"/>
<source>Confirm deletion</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="719"/>
+ <location filename="../src/gui/socketapi.cpp" line="718"/>
<source>Do you want to delete the directory &lt;i&gt;%1&lt;/i&gt; and all its contents permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="720"/>
+ <location filename="../src/gui/socketapi.cpp" line="719"/>
<source>Do you want to delete the file &lt;i&gt;%1&lt;/i&gt; permanently?</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="759"/>
+ <location filename="../src/gui/socketapi.cpp" line="758"/>
<source>Select new location...</source>
<translation>选择一个新的位置....</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="769"/>
+ <location filename="../src/gui/socketapi.cpp" line="768"/>
<source>Error</source>
<translation>错误</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="770"/>
+ <location filename="../src/gui/socketapi.cpp" line="769"/>
<source>Moving file failed:
%1</source>
@@ -3466,85 +3432,85 @@ This is a new, experimental mode. If you decide to use it, please report any iss
%1</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="777"/>
+ <location filename="../src/gui/socketapi.cpp" line="776"/>
<source>I shared something with you</source>
<translation>我给你分享了一些东西</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="790"/>
- <location filename="../src/gui/socketapi.cpp" line="821"/>
+ <location filename="../src/gui/socketapi.cpp" line="789"/>
+ <location filename="../src/gui/socketapi.cpp" line="820"/>
<source>Share...</source>
<translation>分享到...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="792"/>
- <location filename="../src/gui/socketapi.cpp" line="837"/>
+ <location filename="../src/gui/socketapi.cpp" line="791"/>
+ <location filename="../src/gui/socketapi.cpp" line="836"/>
<source>Copy private link to clipboard</source>
<translation>将私有链接复制到剪切板</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="793"/>
+ <location filename="../src/gui/socketapi.cpp" line="792"/>
<source>Send private link by email...</source>
<translation>通过email发送私有链接</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this file is not allowed</source>
<translation>再次分享这个文件是不被允许的</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="819"/>
+ <location filename="../src/gui/socketapi.cpp" line="818"/>
<source>Resharing this folder is not allowed</source>
<translation>再次分享这个文件夹是不被允许的</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="831"/>
- <location filename="../src/gui/socketapi.cpp" line="833"/>
+ <location filename="../src/gui/socketapi.cpp" line="830"/>
+ <location filename="../src/gui/socketapi.cpp" line="832"/>
<source>Copy public link to clipboard</source>
<translation>复制公共链接到剪切板</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="924"/>
+ <location filename="../src/gui/socketapi.cpp" line="923"/>
<source>Open in browser</source>
<translation>在浏览器中打开</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="932"/>
+ <location filename="../src/gui/socketapi.cpp" line="931"/>
<source>Show file versions in browser</source>
<translation>在浏览器中查看这个版本</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="955"/>
+ <location filename="../src/gui/socketapi.cpp" line="954"/>
<source>Rename...</source>
<translation>重命名...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="958"/>
+ <location filename="../src/gui/socketapi.cpp" line="957"/>
<source>Rename and upload...</source>
<translation>重命名并上传</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="963"/>
+ <location filename="../src/gui/socketapi.cpp" line="962"/>
<source>Move and rename...</source>
<translation>重命名并移动...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="966"/>
+ <location filename="../src/gui/socketapi.cpp" line="965"/>
<source>Move, rename and upload...</source>
<translation>重命名,移动并上传...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="969"/>
+ <location filename="../src/gui/socketapi.cpp" line="968"/>
<source>Delete local changes</source>
<translation>删除本地改动</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="974"/>
+ <location filename="../src/gui/socketapi.cpp" line="973"/>
<source>Move and upload...</source>
<translation>移动并上传...</translation>
</message>
<message>
- <location filename="../src/gui/socketapi.cpp" line="975"/>
+ <location filename="../src/gui/socketapi.cpp" line="974"/>
<source>Delete</source>
<translation>删除</translation>
</message>
@@ -3762,58 +3728,58 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<translation>%1 (因早先的错误而跳过,将在 %2 后重试)</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="458"/>
+ <location filename="../src/libsync/syncengine.cpp" line="454"/>
<source>Only %1 are available, need at least %2 to start</source>
<comment>Placeholders are postfixed with file sizes using Utility::octetsToString()</comment>
<translation>仅有 %1 有效,至少需要 %2 才能开始</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="491"/>
+ <location filename="../src/libsync/syncengine.cpp" line="487"/>
<source>Unable to open or create the local sync database. Make sure you have write access in the sync folder.</source>
<translation>无法打开或创建本地同步数据库,请保证你有多同步文件夹的访问和写入的权限</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1031"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1027"/>
<source>Disk space is low: Downloads that would reduce free space below %1 were skipped.</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1038"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1034"/>
<source>There is insufficient space available on the server for some uploads.</source>
<translation>该文件在服务器上不可用</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="377"/>
+ <location filename="../src/libsync/syncengine.cpp" line="373"/>
<source>Unresolved conflict.</source>
<translation>尚未解决的冲突</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="355"/>
+ <location filename="../src/libsync/syncengine.cpp" line="351"/>
<source>Could not update virtual file metadata: %1</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="507"/>
+ <location filename="../src/libsync/syncengine.cpp" line="503"/>
<source>Using virtual files with suffix, but suffix is not set</source>
<translation type="unfinished"/>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="519"/>
+ <location filename="../src/libsync/syncengine.cpp" line="515"/>
<source>Unable to read the blacklist from the local database</source>
<translation>无法从本地数据库读取黑名单</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="550"/>
+ <location filename="../src/libsync/syncengine.cpp" line="546"/>
<source>Unable to read from the sync journal.</source>
<translation>无法读取同步日志。</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="634"/>
+ <location filename="../src/libsync/syncengine.cpp" line="630"/>
<source>Cannot open the sync journal</source>
<translation>无法打开同步日志</translation>
</message>
<message>
- <location filename="../src/libsync/syncengine.cpp" line="1014"/>
+ <location filename="../src/libsync/syncengine.cpp" line="1010"/>
<source>Aborted</source>
<translation>已取消</translation>
</message>
@@ -3855,17 +3821,17 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ValidateChecksumHeader</name>
<message>
- <location filename="../src/common/checksums.cpp" line="336"/>
+ <location filename="../src/common/checksums.cpp" line="338"/>
<source>The checksum header is malformed.</source>
<translation>校验异常</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="363"/>
+ <location filename="../src/common/checksums.cpp" line="365"/>
<source>The checksum header contained an unknown checksum type &apos;%1&apos;</source>
<translation>校验头包含未知的校验类型 &apos;%1&apos;</translation>
</message>
<message>
- <location filename="../src/common/checksums.cpp" line="367"/>
+ <location filename="../src/common/checksums.cpp" line="369"/>
<source>The downloaded file does not match the checksum, it will be resumed.</source>
<translation>下载的文件校验失败,将会回退。</translation>
</message>
@@ -3909,243 +3875,243 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<context>
<name>OCC::ownCloudGui</name>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="277"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="268"/>
<source>Please sign in</source>
<translation>请登录</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="323"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="314"/>
<source>Folder %1: %2</source>
<translation>文件夹 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="341"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="332"/>
<source>There are no sync folders configured.</source>
<translation>没有已配置的同步文件夹。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="350"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="341"/>
<source>Open in browser</source>
<translation>在浏览器中打开</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="399"/>
- <location filename="../src/gui/owncloudgui.cpp" line="717"/>
- <location filename="../src/gui/owncloudgui.cpp" line="814"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="390"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="708"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="805"/>
<source>Log in...</source>
<translation>登录</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="403"/>
- <location filename="../src/gui/owncloudgui.cpp" line="709"/>
- <location filename="../src/gui/owncloudgui.cpp" line="816"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="394"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="807"/>
<source>Log out</source>
<translation>注销</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="504"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="495"/>
<source>Recent Changes</source>
<translation>最近修改</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="377"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="368"/>
<source>Managed Folders:</source>
<translation>管理的文件夹:</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="380"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="371"/>
<source>Open folder &apos;%1&apos;</source>
<translation>打开文件夹“%1”</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="352"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="343"/>
<source>Open %1 in browser</source>
<translation>在浏览器中打开%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="209"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="200"/>
<source>The server on account %1 runs an unsupported version %2. Using this client with unsupported server versions is untested and potentially dangerous. Proceed at your own risk.</source>
<translation>账户 %1 的服务器运行着不受支持的版本 %2。使用该客户端未支持的服务器版本未经测试并且可能存在潜在危险。继续操作需要自行承担风险。</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="797"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="788"/>
<source>Unknown status</source>
<translation>未知状态</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="799"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="790"/>
<source>Settings...</source>
<translation>设置...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="801"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="792"/>
<source>Details...</source>
<translation>细节...</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="807"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="798"/>
<source>Help</source>
<translation>帮助</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="811"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="802"/>
<source>Quit %1</source>
<translation>退出 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="258"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="249"/>
<source>Disconnected from %1</source>
<translation>已从服务器断开 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="208"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="199"/>
<source>Unsupported Server Version</source>
<translation>不支持的服务器版本</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="248"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="239"/>
<source>Disconnected</source>
<translation>连接已断开</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="250"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="241"/>
<source>Disconnected from some accounts</source>
<translation>与一些账号断开连接</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="261"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="252"/>
<source>Disconnected from accounts:</source>
<translation>已断开账户: </translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="263"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="254"/>
<source>Account %1: %2</source>
<translation>账户 %1: %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="278"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="269"/>
<source>Signed out</source>
<translation>已退出</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="282"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="273"/>
<source>Account synchronization is disabled</source>
<translation>帐户同步被禁用</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="283"/>
- <location filename="../src/gui/owncloudgui.cpp" line="336"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="274"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="327"/>
<source>Synchronization is paused</source>
<translation>同步操作被暂停</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="331"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="322"/>
<source>Unresolved conflicts</source>
<translation>尚未解决的冲突</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="338"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="329"/>
<source>Error during synchronization</source>
<translation>同步中出错</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="342"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="333"/>
<source>No sync folders configured</source>
<translation>未设置同步文件夹</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="388"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="379"/>
<source>Unpause all folders</source>
<translation>解除暂停所有文件夹</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="393"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="384"/>
<source>Pause all folders</source>
<translation>暂停所有文件夹</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="688"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="679"/>
<source>Unpause all synchronization</source>
<translation>解除暂停所有同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="690"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="681"/>
<source>Unpause synchronization</source>
<translation>解除暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="698"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="689"/>
<source>Pause all synchronization</source>
<translation>暂停所有同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="700"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="691"/>
<source>Pause synchronization</source>
<translation>暂停同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="707"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="698"/>
<source>Log out of all accounts</source>
<translation>注销所有账户</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="715"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="706"/>
<source>Log in to all accounts...</source>
<translation>登录所有账户</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="791"/>
<source>New account...</source>
<translation>新账号……</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="809"/>
- <location filename="../src/gui/owncloudgui.cpp" line="1175"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="800"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="1158"/>
<source>About %1</source>
<translation>关于%1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="842"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="833"/>
<source>No items synced recently</source>
<translation>近期没有项目被同步</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="864"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="855"/>
<source>Checking for changes in remote &apos;%1&apos;</source>
<translation>检查远端文件 &apos;%1&apos; 的变动</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="867"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="858"/>
<source>Checking for changes in local &apos;%1&apos;</source>
<translation>检查本地文件 &apos;%1&apos; 的变动</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="882"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="873"/>
<source>Syncing %1 of %2 (%3 left)</source>
<translation>同步 %2 中的 %1 (剩余 %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="887"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="878"/>
<source>Syncing %1 of %2</source>
<translation>正在同步 %1,共 %2</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="896"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="887"/>
<source>Syncing %1 (%2 left)</source>
<translation>同步 %1 (剩余 %2)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="899"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="890"/>
<source>Syncing %1</source>
<translation>正在同步 %1</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="917"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="908"/>
<source>%1 (%2, %3)</source>
<translation>%1 (%2, %3)</translation>
</message>
<message>
- <location filename="../src/gui/owncloudgui.cpp" line="333"/>
+ <location filename="../src/gui/owncloudgui.cpp" line="324"/>
<source>Up to date</source>
<translation>更新</translation>
</message>